Merge pull request #4 from Styopchik/minimumorderfee-3

Hide checkout agreement if fee is not applicable. fixes #3
Styopchik · Apr 18, 2019 · b26dd2d · b26dd2d
2 parents d379d02 + 47ffe74
commit b26dd2d
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/Plugin/CheckoutAgreements/Model/AgreementsProviderPlugin.php b/Plugin/CheckoutAgreements/Model/AgreementsProviderPlugin.php
@@ -7,7 +7,6 @@
 
 namespace Netzexpert\MinimumOrderFee\Plugin\CheckoutAgreements\Model;
 
-
 class AgreementsProviderPlugin
 {
 
@@ -25,7 +24,7 @@ class AgreementsProviderPlugin
     public function __construct(
         \Magento\Checkout\Model\Session $session,
         \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
-    ){
+    ) {
         $this->checkoutSession = $session;
         $this->chekoutAgreementsRepository = $checkoutAgreementsRepository;
     }
@@ -34,17 +33,18 @@ public function __construct(
     /**
      * @param \Magento\CheckoutAgreements\Model\AgreementsProvider $agreementsProvider
      * @param int[] $agreementIds
+     * @return int[]
      */
     public function afterGetRequiredAgreementIds(
         \Magento\CheckoutAgreements\Model\AgreementsProvider $agreementsProvider,
         $agreementIds
     ) {
         $fee = $this->getMinimumOrderFeeValue();
-        if(!$fee){
-            foreach ($agreementIds as $key => $agreementId){
+        if (!$fee) {
+            foreach ($agreementIds as $key => $agreementId) {
                 $agreement = $this->chekoutAgreementsRepository->get($agreementId);
                 if ($agreement->getName() == 'Minimum Order Fee') {
-                    unset ($agreementIds[$key]);
+                    unset($agreementIds[$key]);
                 }
             }
         }
@@ -54,13 +54,14 @@ public function afterGetRequiredAgreementIds(
     /**
      * @return bool
      */
-    protected function getMinimumOrderFeeValue(){
+    protected function getMinimumOrderFeeValue()
+    {
         $totals = $this->checkoutSession->getQuote()->getTotals();
-        if(!isset($totals['minimumorderfee'])){
+        if (!isset($totals['minimumorderfee'])) {
             return false;
         }
         /** @var \Magento\Quote\Model\Quote\Address\Total $minimumOrderFee */
         $minimumOrderFee = $totals['minimumorderfee'];
         return $minimumOrderFee->getValue();
     }
-}
+}
diff --git a/Plugin/CheckoutAgreementsListPlugin.php b/Plugin/CheckoutAgreementsListPlugin.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Created by Andrew Stepanchuk.
+ * Date: 18.04.19
+ * Time: 16:12
+ */
+
+namespace Netzexpert\MinimumOrderFee\Plugin;
+
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface;
+use Magento\CheckoutAgreements\Api\Data\AgreementInterface;
+use Netzexpert\MinimumOrderFee\Plugin\CheckoutAgreements\Model\AgreementsProviderPlugin;
+
+class CheckoutAgreementsListPlugin extends AgreementsProviderPlugin
+{
+    /**
+     * @param CheckoutAgreementsListInterface $agreementsList
+     * @param AgreementInterface[] $agreements
+     * @return mixed
+     */
+    public function afterGetList(
+        CheckoutAgreementsListInterface $agreementsList,
+        $agreements
+    ) {
+        $fee = $this->getMinimumOrderFeeValue();
+        if (!$fee) {
+            foreach ($agreements as $key => $agreement) {
+                if ($agreement->getName() == 'Minimum Order Fee') {
+                    unset($agreements[$key]);
+                }
+            }
+        }
+        return $agreements;
+    }
+}
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "magento/module-sales": ">=100.0.0 <104"
     },
     "type": "magento2-module",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -11,4 +11,8 @@
         <plugin name="minimum_order_fee_message"
                 type="Netzexpert\MinimumOrderFee\Plugin\Checkout\CustomerData\CartPlugin" />
     </type>
+    <type name="Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface">
+        <plugin name="feeFilterAgreements"
+                type="Netzexpert\MinimumOrderFee\Plugin\CheckoutAgreementsListPlugin" />
+    </type>
 </config>