fix order conf mail

Invertus · Aug 9, 2024 · 52a0ae5 · 52a0ae5
1 parent 5f5fd16
commit 52a0ae5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 45 deletions.
diff --git a/saferpayofficial.php b/saferpayofficial.php
@@ -591,13 +591,6 @@ public function hookActionEmailSendBefore($params)
             return true;
         }
 
-        /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
-        $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
-
-        if ($params['template'] === 'order_conf') {
-            return $canSendOrderConfirmationEmail->verify((int) $order->current_state);
-        }
-
         if ($params['template'] === 'new_order') {
             if ((int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_NEW_ORDER_MAIL)) {
                 return true;
@@ -607,44 +600,6 @@ public function hookActionEmailSendBefore($params)
         }
     }
 
-    public function hookActionOrderHistoryAddAfter($params = [])
-    {
-        /** @var OrderHistory $orderHistory */
-        $orderHistory = $params['order_history'];
-
-        if (!$orderHistory instanceof OrderHistory) {
-            return;
-        }
-
-        $idOrder = (int) $orderHistory->id_order;
-
-        $internalOrder = new Order($idOrder);
-
-        if (!Validate::isLoadedObject($internalOrder)) {
-            return;
-        }
-
-        $order = new Order($idOrder);
-
-        $orderStatus = new OrderState((int) $order->current_state);
-
-        if (!Validate::isLoadedObject($orderStatus)) {
-            return;
-        }
-
-        /** @var \Invertus\SaferPay\Service\SaferPayMailService $mailService */
-        $mailService = $this->getService(\Invertus\SaferPay\Service\SaferPayMailService::class);
-
-        /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
-        $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
-
-        if ($canSendOrderConfirmationEmail->verify((int) $orderStatus->id)) {
-            if ((int) \Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED) === (int) $orderStatus->id) {
-                $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
-            }
-        }
-    }
-
     public function hookActionAdminControllerSetMedia()
     {
         if ('AdminOrders' === Tools::getValue('controller') &&

diff --git a/upgrade/install-1.2.3.php b/upgrade/install-1.2.3.php
@@ -36,6 +36,7 @@ function upgrade_module_1_2_3(SaferPayOfficial $module)
         $installer->createPendingOrderStatus() &&
         Db::getInstance()->execute('ALTER TABLE ' . _DB_PREFIX_ . 'saferpay_order ADD COLUMN `pending` TINYINT(1) DEFAULT 0') &&
         $module->registerHook('displayOrderConfirmation') &&
+        $module->unregisterHook('actionOrderHistoryAddAfter') &&
         Configuration::updateValue(RequestHeader::SPEC_VERSION, SaferPayConfig::API_VERSION) &&
         Configuration::updateValue(RequestHeader::SPEC_REFUND_VERSION, SaferPayConfig::API_VERSION);
 }