Move refund files to its folder and fix issues

mollie · Dec 24, 2024 · 6a3fa30 · 6a3fa30
1 parent 863b1c9
commit 6a3fa30
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 23 deletions.
diff --git a/inc/utils.php b/inc/utils.php
@@ -165,7 +165,8 @@ function mollieWooCommerceIsVoucherEnabled()
 */
 function mollieWooCommerceIsMollieGateway($gateway)
 {
-    if (strpos($gateway, 'mollie_wc_gateway_') !== false) {
+    if ((is_string($gateway) && strpos($gateway, 'mollie_wc_gateway_') !== false)
+        || (is_object($gateway) && strpos($gateway->id, 'mollie_wc_gateway_') !== false)) {
         return true;
     }
     return false;

diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -79,11 +79,16 @@ public function run(ContainerInterface $container): bool
             'woocommerce_payment_gateways',
             static function ($gateways) use ($container) {
                 $deprecatedGatewayHelpers = $container->get('__deprecated.gateway_helpers');
-
                 foreach ($gateways as $gateway) {
-                   $isMolliegateway = strpos($gateway, 'mollie_wc_gateway_') !== false;
+
+                   $isMolliegateway = is_string($gateway) && strpos($gateway, 'mollie_wc_gateway_') !== false
+                   || is_object($gateway) && strpos($gateway->id, 'mollie_wc_gateway_') !== false;
+                   if (!$isMolliegateway) {
+                       continue;
+                   }
+
                    $isSubscriptiongateway = $gateway->supports('subscriptions');
-                     if ($isMolliegateway && $isSubscriptiongateway) {
+                     if ($isSubscriptiongateway) {
                          $deprecatedGatewayHelpers[$gateway->id]->addSubscriptionFilters($gateway);
                      }
                }

diff --git a/src/Payment/OrderItemsRefunder.php → src/Gateway/Refund/OrderItemsRefunder.php b/src/Payment/OrderItemsRefunder.php → src/Gateway/Refund/OrderItemsRefunder.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\Payment;
+namespace Mollie\WooCommerce\Gateway\Refund;
 
 use Mollie\Api\Endpoints\OrderEndpoint;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Refund;
-use Mollie\WooCommerce\Plugin;
 use Mollie\WooCommerce\Shared\Data;
 use UnexpectedValueException;
 use WC_Order;

diff --git a/src/Payment/OrderLineStatus.php → src/Gateway/Refund/OrderLineStatus.php b/src/Payment/OrderLineStatus.php → src/Gateway/Refund/OrderLineStatus.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\Payment;
+namespace Mollie\WooCommerce\Gateway\Refund;
 
 use Mollie\Api\Types\OrderLineStatus as ApiOrderLineStatus;
 

diff --git a/src/Payment/PartialRefundException.php → ...Gateway/Refund/PartialRefundException.php b/src/Payment/PartialRefundException.php → ...Gateway/Refund/PartialRefundException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\Payment;
+namespace Mollie\WooCommerce\Gateway\Refund;
 
 use UnexpectedValueException;
 

diff --git a/src/Payment/RefundLineItemsBuilder.php → ...Gateway/Refund/RefundLineItemsBuilder.php b/src/Payment/RefundLineItemsBuilder.php → ...Gateway/Refund/RefundLineItemsBuilder.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Mollie\WooCommerce\Payment;
+namespace Mollie\WooCommerce\Gateway\Refund;
 
 use Mollie\WooCommerce\Shared\Data;
 use stdClass;

diff --git a/src/Gateway/Refund/RefundProcessor.php b/src/Gateway/Refund/RefundProcessor.php
@@ -5,7 +5,6 @@
 use Exception;
 use Inpsyde\PaymentGateway\RefundProcessorInterface;
 use Mollie\Api\Exceptions\ApiException;
-use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
 use WC_Order;
 
 class RefundProcessor implements RefundProcessorInterface

diff --git a/src/Gateway/inc/services.php b/src/Gateway/inc/services.php
@@ -7,6 +7,8 @@
 use Inpsyde\PaymentGateway\RefundProcessorInterface;
 use Mollie\WooCommerce\Gateway\DeprecatedGatewayBuilder;
 use Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler;
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
+use Mollie\WooCommerce\Gateway\Refund\RefundLineItemsBuilder;
 use Mollie\WooCommerce\Gateway\Refund\RefundProcessor;
 use Mollie\WooCommerce\Gateway\Surcharge;
 use Mollie\WooCommerce\Notice\AdminNotice;
@@ -110,6 +112,19 @@
             $pluginPath = $container->get('shared.plugin_path');
             return new IconFactory($pluginUrl, $pluginPath);
         },
+        RefundLineItemsBuilder::class => static function (ContainerInterface $container): RefundLineItemsBuilder {
+            $data = $container->get('settings.data_helper');
+            return new RefundLineItemsBuilder($data);
+        },
+        OrderItemsRefunder::class => static function (ContainerInterface $container): OrderItemsRefunder {
+            $data = $container->get('settings.data_helper');
+            $refundLineItemsBuilder = $container->get(RefundLineItemsBuilder::class);
+            $apiHelper = $container->get('SDK.api_helper');
+            $apiKey = $container->get('settings.settings_helper')->getApiKey();
+            $orderEndpoint = $apiHelper->getApiClient($apiKey)->orders;
+
+            return new OrderItemsRefunder($refundLineItemsBuilder, $data, $orderEndpoint);
+        },
         PaymentService::class => static function (ContainerInterface $container): PaymentService {
             $logger = $container->get(Logger::class);
             assert($logger instanceof Logger);

diff --git a/src/Payment/MollieObject.php b/src/Payment/MollieObject.php
@@ -21,10 +21,6 @@
 
 class MollieObject
 {
-    public const MAXIMAL_LENGHT_ADDRESS = 100;
-    public const MAXIMAL_LENGHT_POSTALCODE = 20;
-    public const MAXIMAL_LENGHT_CITY = 200;
-    public const MAXIMAL_LENGHT_REGION = 200;
     protected $data;
     /**
      * @var string[]

diff --git a/src/Payment/MollieOrder.php b/src/Payment/MollieOrder.php
@@ -10,6 +10,8 @@
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Refund;
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
+use Mollie\WooCommerce\Gateway\Refund\PartialRefundException;
 use Mollie\WooCommerce\Payment\Request\RequestFactory;
 use Mollie\WooCommerce\PaymentMethods\Voucher;
 use Mollie\WooCommerce\SDK\Api;

diff --git a/src/Payment/MollieSubscription.php b/src/Payment/MollieSubscription.php
@@ -2,9 +2,7 @@
 
 namespace Mollie\WooCommerce\Payment;
 
-use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Types\SequenceType;
-use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
 

diff --git a/src/Payment/PaymentModule.php b/src/Payment/PaymentModule.php
@@ -9,19 +9,16 @@
 use Inpsyde\Modularity\Module\ExecutableModule;
 use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
 use Inpsyde\Modularity\Module\ServiceModule;
-use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Refund;
 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
-use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\Settings\Settings;
-use Mollie\WooCommerce\Shared\Data;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Psr\Log\LogLevel;
 use RuntimeException;
 use WC_Order;
 

diff --git a/src/Payment/Request/Decorators/AddressDecorator.php b/src/Payment/Request/Decorators/AddressDecorator.php
@@ -4,10 +4,15 @@
 
 namespace Mollie\WooCommerce\Payment\Request\Decorators;
 
+use stdClass;
 use WC_Order;
 
 class AddressDecorator implements RequestDecoratorInterface
 {
+    public const MAXIMAL_LENGHT_ADDRESS = 100;
+    public const MAXIMAL_LENGHT_POSTALCODE = 20;
+    public const MAXIMAL_LENGHT_CITY = 200;
+    public const MAXIMAL_LENGHT_REGION = 200;
     public function decorate(array $requestData, WC_Order $order, $context = null): array
     {
         $isPayPalExpressOrder = $order->get_meta('_mollie_payment_method_button') === 'PayPalButton';

diff --git a/src/Payment/inc/services.php b/src/Payment/inc/services.php
@@ -3,11 +3,10 @@
 declare(strict_types=1);
 
 
-
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\Payment\MollieOrder;
 use Mollie\WooCommerce\Payment\MolliePayment;
-use Mollie\WooCommerce\Payment\OrderItemsRefunder;
 use Mollie\WooCommerce\Payment\OrderLines;
 use Mollie\WooCommerce\Payment\PaymentFactory;
 use Mollie\WooCommerce\Payment\Request\Decorators\AddCustomRequestFieldsDecorator;
@@ -53,6 +52,7 @@
             $pluginId = $container->get('shared.plugin_id');
             return new OrderLines($data, $pluginId);
         },
+
         PaymentFactory::class => static function (ContainerInterface $container): PaymentFactory {
             return new PaymentFactory(
                 function () use ($container) {

diff --git a/src/Subscription/MollieSubscriptionGatewayHandler.php b/src/Subscription/MollieSubscriptionGatewayHandler.php
@@ -92,7 +92,7 @@ public function __construct(
         );
     }
 
-    public function addSubscriptionFiters($gateway) {
+    public function addSubscriptionFilters($gateway) {
         if (class_exists('WC_Subscriptions_Order')) {
             add_action('woocommerce_scheduled_subscription_payment_' . $gateway->id,
                 static function ($renewal_total, WC_Order $renewal_order) use ($gateway) {