Merge pull request #881 from mollie/fix/PIWOO-424

[PIWOO-424] Payment Status column displayed in orders overview when capturing payments immediately
mollie · Sep 25, 2024 · a0f5f57 · a0f5f57
2 parents c6e10f6 + af2cdc4
commit a0f5f57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/MerchantCapture/MerchantCaptureModule.php b/src/MerchantCapture/MerchantCaptureModule.php
@@ -250,7 +250,7 @@ static function ($disableShipAndCapture, WC_Order $order) use ($container) {
                 10,
                 2
             );
-            new OrderListPaymentColumn();
+            new OrderListPaymentColumn($container);
             new ManualCapture($container);
             new StateChangeCapture($container);
         });

diff --git a/src/MerchantCapture/OrderListPaymentColumn.php b/src/MerchantCapture/OrderListPaymentColumn.php
@@ -6,11 +6,15 @@
 
 use WC_Order;
 use Mollie\WooCommerce\MerchantCapture\UI\StatusRenderer;
+use Mollie\WooCommerce\Vendor\Psr\Container\ContainerInterface;
 
 class OrderListPaymentColumn
 {
-    public function __construct()
+    /** @var ContainerInterface $container */
+    private $container;
+    public function __construct($container)
     {
+        $this->container = $container;
         add_filter('manage_edit-shop_order_columns', [$this, 'renderColumn']);
         add_action('manage_shop_order_posts_custom_column', [$this, 'renderColumnValue'], 10, 2);
 
@@ -23,6 +27,10 @@ public function __construct()
 
     public function renderColumn(array $columns): array
     {
+        if (!$this->container->get('merchant.manual_capture.enabled')) {
+            return $columns;
+        }
+
         $newColumns = [];
         $mollieColumnAdded = false;