Merge remote-tracking branch 'origin/fix/PIWOO-367' into release/7.4.…

…2-beta-1-flags # Conflicts: # src/MerchantCapture/MerchantCaptureModule.php
mollie · Jan 25, 2024 · 1b3d30f · 1b3d30f
2 parents 1839e2b + 8348ba1
commit 1b3d30f
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 23 deletions.
diff --git a/src/MerchantCapture/Capture/Type/StateChangeCapture.php b/src/MerchantCapture/Capture/Type/StateChangeCapture.php
@@ -19,7 +19,16 @@ class StateChangeCapture
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
+        $pluginId = $container->get('shared.plugin_id');
+
         add_action('woocommerce_order_status_changed', [$this, "orderStatusChange"], 10, 3);
+
+        /** When the webhook process is activated we don't need automatic status change. Status change is handled
+         *  by the webhook logic.
+         */
+        add_action($pluginId . '_before_webhook_payment_action', function () {
+            remove_action('woocommerce_order_status_changed', [$this, "orderStatusChange"]);
+        });
     }
 
     public function orderStatusChange(int $orderId, string $oldStatus, string $newStatus)

diff --git a/src/MerchantCapture/MerchantCaptureModule.php b/src/MerchantCapture/MerchantCaptureModule.php
@@ -144,29 +144,55 @@ public function services(): array
 
     public function run(ContainerInterface $container): bool
     {
-        $pluginId = $container->get('shared.plugin_id');
-        $captureSettings = new MollieCaptureSettings();
-        add_action(
-        /**
-         * @throws \WC_Data_Exception
-         */            $pluginId . '_after_webhook_action',
-            static function (Payment $payment, WC_Order $order) use ($container) {
-                if ($payment->isAuthorized()) {
-                    if (!$payment->getAmountCaptured() == 0.0) {
-                        return;
+        add_action('init', static function () use ($container) {
+            $pluginId = $container->get('shared.plugin_id');
+            $captureSettings = new MollieCaptureSettings();
+            if (!apply_filters('mollie_wc_gateway_enable_merchant_capture_module', false)) {
+                return;
+            }
+
+            add_action(
+                $pluginId . '_after_webhook_action',
+                static function (Payment $payment, WC_Order $order) use ($container) {
+
+                    if ($payment->isAuthorized()) {
+                        if (!$payment->getAmountCaptured() == 0.0) {
+                            return;
+                        }
+                        $order->set_status(SharedDataDictionary::STATUS_ON_HOLD);
+                        $order->update_meta_data(
+                            self::ORDER_PAYMENT_STATUS_META_KEY,
+                            ManualCaptureStatus::STATUS_AUTHORIZED
+                        );
+                        $order->set_transaction_id($payment->id);
+                        $order->save();
+                    } elseif (
+                        $payment->isPaid() && (
+                            ($container->get('merchant.manual_capture.is_waiting'))($order) ||
+                            ($container->get('merchant.manual_capture.is_authorized'))($order)
+                        )
+                    ) {
+                        $order->update_meta_data(
+                            self::ORDER_PAYMENT_STATUS_META_KEY,
+                            ManualCaptureStatus::STATUS_CAPTURED
+                        );
+                        $order->save();
+                    } elseif (
+                        $payment->isCanceled()  && (
+                            ($container->get('merchant.manual_capture.is_waiting'))($order) ||
+                            ($container->get('merchant.manual_capture.is_authorized'))($order)
+                        )
+                    ) {
+                        $order->update_meta_data(
+                            self::ORDER_PAYMENT_STATUS_META_KEY,
+                            ManualCaptureStatus::STATUS_VOIDED
+                        );
+                        $order->save();
                     }
-                    $order->set_status(SharedDataDictionary::STATUS_ON_HOLD);
-                    $order->update_meta_data(self::ORDER_PAYMENT_STATUS_META_KEY, ManualCaptureStatus::STATUS_AUTHORIZED);
-                    $order->set_transaction_id($payment->id);
-                    $order->save();
-                } elseif ($payment->isPaid() && ($container->get('merchant.manual_capture.is_waiting'))($order)) {
-                    $order->update_meta_data(self::ORDER_PAYMENT_STATUS_META_KEY, ManualCaptureStatus::STATUS_CAPTURED);
-                    $order->save();
-                }
-            },
-            10,
-            2
-        );
+                },
+                10,
+                2
+            );
 
             add_action('woocommerce_order_refunded', static function (int $orderId) use ($container) {
                 $order = wc_get_order($orderId);
@@ -209,7 +235,7 @@ static function ($disableShipAndCapture, WC_Order $order) use ($container) {
                     if ($disableShipAndCapture) {
                         return true;
                     }
-                    return $container->get('merchant.manual_capture.is_waiting')($order);
+                    return $container->get('merchant.manual_capture.is_waiting')($order) || $container->get('merchant.manual_capture.is_authorized')($order);
                 },
                 10,
                 2
@@ -223,6 +249,8 @@ static function ($disableShipAndCapture, WC_Order $order) use ($container) {
             new OrderListPaymentColumn();
             new ManualCapture($container);
             new StateChangeCapture($container);
+        });
+
         return true;
     }
 }
diff --git a/src/Payment/MollieOrderService.php b/src/Payment/MollieOrderService.php
@@ -167,6 +167,7 @@ public function onWebhookAction()
         }
 
         if (method_exists($payment_object, $method_name)) {
+            do_action($this->pluginId . '_before_webhook_payment_action', $payment, $order);
             $payment_object->{$method_name}($order, $payment, $payment_method_title);
         } else {
             $order->add_order_note(sprintf(