order id fix

mollie · Aug 6, 2020 · 1be022b · 1be022b
1 parent 4176328
commit 1be022b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/controllers/front/payment.php b/controllers/front/payment.php
@@ -153,7 +153,8 @@ public function initContent()
         $this->createOrder($method, $apiPayment, $cart->id, $originalAmount, $customer->secure_key, $orderReference);
         $orderReference = isset($apiPayment->metadata->order_reference) ? pSQL($apiPayment->metadata->order_reference) : '';
 
-        $order = Order::getOrderByCartId($cart->id);
+        $orderId = Order::getOrderByCartId($cart->id);
+        $order = new Order($orderId);
         if ($apiPayment->method !== PaymentMethod::BANKTRANSFER) {
             try {
                 Db::getInstance()->insert(

diff --git a/mollie.php b/mollie.php
@@ -1135,7 +1135,8 @@ public function hookActionEmailSendBefore($params)
         }
 
         $cart = new Cart($params['cart']->id);
-        $order = Order::getOrderByCartId($cart->id);
+        $orderId = Order::getOrderByCartId($cart->id);
+        $order = new Order($orderId);
         if ($order === null || $order->module !== $this->name) {
             return true;
         }
@@ -1166,7 +1167,8 @@ public function hookActionEmailSendBefore($params)
             $params['template'] === 'outofstock' ||
             $params['template'] === 'bankwire' ||
             $params['template'] === 'refund') {
-            $order = Order::getOrderByCartId($cart->id);
+            $orderId = Order::getOrderByCartId($cart->id);
+            $order = new Order($orderId);
             if (!$order) {
                 return true;
             }