Fixed order email confirmation mechanism

vippsas · Mar 6, 2020 · 2bcc196 · 2bcc196
1 parent 61976bc
commit 2bcc196
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/Model/TransactionProcessor.php b/Model/TransactionProcessor.php
@@ -215,8 +215,6 @@ private function processReservedTransaction(QuoteInterface $vippsQuote, Transact
         $vippsQuote->setStatus(QuoteInterface::STATUS_RESERVED);
         $this->quoteManagement->save($vippsQuote);
 
-        $this->sendOrderConfirmation($order);
-
         return $order;
     }
 
@@ -421,18 +419,6 @@ private function authorize(OrderInterface $order, Transaction $transaction)
         $this->orderRepository->save($order);
     }
 
-    /**
-     * Send order conformation email if not sent
-     *
-     * @param Order|OrderInterface $order
-     */
-    private function sendOrderConfirmation($order)
-    {
-        if ($order->getCanSendNewEmailFlag() && !$order->getEmailSent()) {
-            $this->orderManagement->notify($order->getEntityId());
-        }
-    }
-
     /**
      * @param $lockName
      *

diff --git a/Observer/CheckoutSubmitAllAfter.php b/Observer/CheckoutSubmitAllAfter.php
@@ -71,20 +71,21 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        try {
-            /** @var OrderInterface $order */
-            $order = $observer->getData('order');
+        /** @var OrderInterface $order */
+        $order = $observer->getData('order');
+        if ('vipps' == $order->getPayment()->getMethod()) {
+            try {
+                // send order placed email
+                $this->notify($order);
 
-            // send order placed email
-            $this->notify($order);
-
-            // updated vipps quote
-            $vippsQuote = $this->quoteRepository->loadByOrderId($order->getIncrementId());
-            $vippsQuote->setOrderId((int)$order->getEntityId());
-            $vippsQuote->setStatus(QuoteInterface::STATUS_PENDING);
-            $this->quoteRepository->save($vippsQuote);
-        } catch (\Throwable $t) {
-            $this->logger->error($t->getMessage());
+                // updated vipps quote
+                $vippsQuote = $this->quoteRepository->loadByOrderId($order->getIncrementId());
+                $vippsQuote->setOrderId((int)$order->getEntityId());
+                $vippsQuote->setStatus(QuoteInterface::STATUS_PENDING);
+                $this->quoteRepository->save($vippsQuote);
+            } catch (\Throwable $t) {
+                $this->logger->error($t->getMessage());
+            }
         }
     }