Merge pull request #23 from procd92/fix-email-sending-bug

Fix Async Email Bug

Author: shoa48

Moyasar/Mysr/Console/Command/CheckPendingPaymentsCommand.php

@@ -141,7 +141,6 @@ private function processPayment($order)
         if (! isset($additionalInfo['moyasar_payment_id'])) {
             $paymentId = $payment->getEntityId();
             $orderId = $order->getId();
-            $this->logger->warning("Payment ($paymentId) of Order ($orderId) does not have Moyasar payment ID");
             return;
         }
 

Moyasar/Mysr/Observer/BeforeOrderPlaceObserver.php

@@ -4,12 +4,29 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Moyasar\Mysr\Model\Payment\MoyasarApplePay;
+use Moyasar\Mysr\Model\Payment\MoyasarCc;
+use Moyasar\Mysr\Model\Payment\MoyasarSadad;
 
 class BeforeOrderPlaceObserver implements ObserverInterface
 {
     public function execute(Observer $observer)
     {
+        $methods = [
+            MoyasarApplePay::CODE,
+            MoyasarCc::CODE,
+            MoyasarSadad::CODE
+        ];
+
         $order = $observer->getOrder();
-        $order->setCanSendNewEmailFlag(false);
+        if (!$order) {
+            return;
+        }
+
+        $payment = $order->getPayment();
+
+        if ($payment && in_array($payment->getMethod(), $methods)) {
+            $order->setCanSendNewEmailFlag(false);
+        }
     }
 }