Merge pull request #42 from mundipagg/hotfix-fix-observers-when-modul…

…e-is-disabled Fix observers when the module is disabled.
mundipagg · Jan 30, 2019 · ed1d2cd · ed1d2cd
2 parents 51fbde1 + 587cdc9
commit ed1d2cd
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 3 deletions.
diff --git a/Concrete/Magento2PlatformOrderDecorator.php b/Concrete/Magento2PlatformOrderDecorator.php
@@ -199,6 +199,12 @@ public function getInvoiceCollection()
     /** @return OrderId */
     public function getMundipaggId()
     {
+        $orderId = $this->platformOrder->getPayment()->getLastTransId();
+
+        if (empty($orderId)) {
+            return null;
+        }
+
         return new OrderId($this->platformOrder->getPayment()->getLastTransId());
     }
 }
diff --git a/Observer/AdminCustomerBeforeSave.php b/Observer/AdminCustomerBeforeSave.php
@@ -5,6 +5,8 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
 use MundiPagg\MundiPagg\Helper\CustomerUpdateMundipaggHelper;
+use MundiPagg\MundiPagg\Model\MundiPaggConfigProvider;
+use Magento\Framework\App\ObjectManager;
 
 class AdminCustomerBeforeSave implements ObserverInterface
 {
@@ -25,10 +27,21 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
+        if (!$this->moduleIsEnable()) {
+            return $this;
+        }
+
         $event = $observer->getEvent();
 
         $this->customerUpdateMundipaggHelper->updateEmailMundipagg($event->getCustomer());
 
     }
 
+    public function moduleIsEnable()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $mundipaggProvider = $objectManager->get(MundiPaggConfigProvider::class);
+
+        return $mundipaggProvider->getModuleStatus();
+    }
 }
diff --git a/Observer/CustomerAddressSaveBefore.php b/Observer/CustomerAddressSaveBefore.php
@@ -5,6 +5,8 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Exception\InputException;
+use MundiPagg\MundiPagg\Model\MundiPaggConfigProvider;
+use Magento\Framework\App\ObjectManager;
 
 class CustomerAddressSaveBefore implements ObserverInterface
 {
@@ -14,13 +16,25 @@ class CustomerAddressSaveBefore implements ObserverInterface
      */
     public function execute(EventObserver $observer)
     {
+        if (!$this->moduleIsEnable()) {
+            return $this;
+        }
+
         $customerAddress = $observer->getCustomerAddress();
 
         $this->addressValidation($customerAddress);
 
         return $this;
     }
 
+    public function moduleIsEnable()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $mundipaggProvider = $objectManager->get(MundiPaggConfigProvider::class);
+
+        return $mundipaggProvider->getModuleStatus();
+    }
+
     /**
      * @param $customerAddress
      * @throws InputException

diff --git a/Observer/DataValidateAdmin.php b/Observer/DataValidateAdmin.php
@@ -77,11 +77,20 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        if (!$this->moduleIsEnable()) {
+            return $this;
+        }
+
         $this->validateConfigMagento();
 
         return $this;
     }
 
+    public function moduleIsEnable()
+    {
+        return $this->configProviderMundipagg->getModuleStatus();
+    }
+
     protected function validateConfigMagento()
     {
         $disableModule = false;

diff --git a/Observer/OrderCancelAfter.php b/Observer/OrderCancelAfter.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Phrase;
 use MundiPagg\MundiPagg\Concrete\Magento2CoreSetup;
 use MundiPagg\MundiPagg\Concrete\Magento2PlatformOrderDecorator;
+use MundiPagg\MundiPagg\Model\MundiPaggConfigProvider;
 
 class OrderCancelAfter implements ObserverInterface
 {
@@ -21,6 +22,10 @@ class OrderCancelAfter implements ObserverInterface
      */
     public function execute(EventObserver $observer)
     {
+        if (!$this->moduleIsEnable()) {
+            return $this;
+        }
+
         try {
             Magento2CoreSetup::bootstrap();
 
@@ -46,6 +51,14 @@ public function execute(EventObserver $observer)
         }
     }
 
+    public function moduleIsEnable()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $mundipaggProvider = $objectManager->get(MundiPaggConfigProvider::class);
+
+        return $mundipaggProvider->getModuleStatus();
+    }
+
     private function cancelOrderByTransactionInfo($transaction)
     {
         $orderService = new OrderService();

diff --git a/Observer/SalesOrderPlaceAfter.php b/Observer/SalesOrderPlaceAfter.php
@@ -14,6 +14,8 @@
 use Magento\Framework\DB\Transaction;
 use MundiPagg\MundiPagg\Gateway\Transaction\CreditCard\Config\Config as ConfigCreditCard;
 use MundiPagg\MundiPagg\Helper\Logger;
+use MundiPagg\MundiPagg\Model\MundiPaggConfigProvider;
+use Magento\Framework\App\ObjectManager;
 
 class SalesOrderPlaceAfter implements ObserverInterface
 {
@@ -97,6 +99,10 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
+        if (!$this->moduleIsEnable()) {
+            return $this;
+        }
+
         $event = $observer->getEvent();
         $order = $event->getOrder();
         $payment = $order->getPayment();
@@ -113,6 +119,14 @@ public function execute(EventObserver $observer)
         return $this;
     }
 
+    public function moduleIsEnable()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $mundipaggProvider = $objectManager->get(MundiPaggConfigProvider::class);
+
+        return $mundipaggProvider->getModuleStatus();
+    }
+
     /**
      * @param Order $order
      * @return $invoice

diff --git a/composer.json b/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "mundipagg/mundipagg-magento2-module",
     "license": "MIT",
-    "version": "1.4.7",
+    "version": "1.4.8",
     "type": "magento2-module",
     "description": "Magento 2 Module Mundipagg",
     "require": {
         "php": ">=5.6.0",
         "mundipagg/mundiapi": "^3.0",
-        "mundipagg/ecommerce-module-core": "1.2.2"
+        "mundipagg/ecommerce-module-core": "1.2.3"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",

diff --git a/etc/module.xml b/etc/module.xml
@@ -9,7 +9,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MundiPagg_MundiPagg" setup_version="1.4.7">
+    <module name="MundiPagg_MundiPagg" setup_version="1.4.8">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />