NTR: PISHPW-221: remove ideal dropdown (#415)

Co-authored-by: Vitalij Mik <[email protected]>
mollie · Jun 18, 2024 · e447147 · e447147
1 parent be4b3cf
commit e447147
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 494 deletions.
diff --git a/.phpstan.lvl8.neon b/.phpstan.lvl8.neon
@@ -2,7 +2,6 @@ parameters:
     level: 8
     paths:
         - ./Command/OrdersShippingCommand.php
-        - ./Components/iDEAL
         - ./Components/Config
         - ./Exceptions
         - ./Services
@@ -16,11 +15,6 @@ parameters:
         # ignore Shopware attributes with magic getters and setters
         - '#Call to method getMollieReturn\(\) on an unknown class Shopware\\Models\\Attribute\\OrderDetail#'
         - '#Call to method setMollieReturn\(\) on an unknown class Shopware\\Models\\Attribute\\OrderDetail#'
-        - '#Call to method getMollieShopwareIdealIssuer\(\) on an unknown class Shopware\\Models\\Attribute\\Customer#'
-        - '#Call to method setMollieShopwareIdealIssuer\(\) on an unknown class Shopware\\Models\\Attribute\\Customer#'
-        # -----------------------------------------------------------------------------------------------------------
-        # ignore magic getters and setters in Mollie API objects
-        - '#Access to an undefined property Mollie\\Api\\Resources\\Issuer::\$isSelected#'
         # -----------------------------------------------------------------------------------------------------------
 
 services:

diff --git a/Components/Services/PaymentService.php b/Components/Services/PaymentService.php
@@ -15,7 +15,7 @@
 use MollieShopware\Components\Constants\PaymentMethodType;
 use MollieShopware\Components\Constants\PaymentStatus;
 use MollieShopware\Components\CurrentCustomer;
-use MollieShopware\Components\iDEAL\iDEALInterface;
+
 use MollieShopware\Components\Mollie\Builder\MolliePaymentBuilder;
 use MollieShopware\Components\Mollie\MollieShipping;
 use MollieShopware\Components\Mollie\Services\TransactionUUID\TransactionUUID;
@@ -121,10 +121,7 @@ class PaymentService
      */
     private $applePayFactory;
 
-    /**
-     * @var iDEALInterface $idealService
-     */
-    private $idealService;
+
 
     /**
      * @var CurrentCustomer
@@ -233,7 +230,7 @@ public function startMollieSession($paymentMethodName, Transaction $transaction,
         # a shop service is somewhere used in there...
         $this->creditCardService = Shopware()->Container()->get('mollie_shopware.credit_card_service');
         $this->applePayFactory = Shopware()->Container()->get('mollie_shopware.components.apple_pay_direct.factory');
-        $this->idealService = Shopware()->Container()->get('mollie_shopware.ideal_service');
+
         $this->customer = Shopware()->Container()->get('mollie_shopware.customer');
         $shopID = Shopware()->Shop()->getId();
 
@@ -632,22 +629,6 @@ private function configurePaymentSettings(PaymentInterface $paymentMethodObject,
         }
 
 
-        if ($paymentMethodObject instanceof IDeal) {
-            # test if we have a current customer (we should have one)
-            # if so, get his selected iDeal issuer.
-            # if an issuer has been set, then also use it for our payment,
-            # otherwise just continue without a prefilled issuer.
-            $currentCustomer = $this->customer->getCurrent();
-
-            if ($currentCustomer instanceof Customer) {
-                $issuer = $this->idealService->getCustomerIssuer($currentCustomer);
-                if (!empty($issuer)) {
-                    /** @var IDeal $paymentMethodObject */
-                    $paymentMethodObject->setIssuer($issuer);
-                }
-            }
-        }
-
         if ($paymentMethodObject instanceof CreditCard) {
             # prevent this method from failing, because at this
             # point we're not sure if the credit card token

diff --git a/Components/iDEAL/iDEAL.php b/Components/iDEAL/iDEAL.php
diff --git a/Components/iDEAL/iDEALInterface.php b/Components/iDEAL/iDEALInterface.php
diff --git a/Controllers/Frontend/Mollie.php b/Controllers/Frontend/Mollie.php
@@ -10,7 +10,6 @@
 use MollieShopware\Components\Helpers\LocaleFinder;
 use MollieShopware\Components\Helpers\MollieRefundStatus;
 use MollieShopware\Components\Helpers\MollieStatusConverter;
-use MollieShopware\Components\iDEAL\iDEALInterface;
 use MollieShopware\Components\MollieApiFactory;
 use MollieShopware\Components\Order\OrderCancellation;
 use MollieShopware\Components\Order\ShopwareOrderBuilder;
@@ -95,10 +94,7 @@ class Shopware_Controllers_Frontend_Mollie extends AbstractPaymentController
      */
     private $localeFinder;
 
-    /**
-     * @var iDEALInterface
-     */
-    private $iDEAL;
+
 
     /**
      * @var CurrentCustomer
@@ -448,47 +444,6 @@ public function retryAction()
         $this->redirectToShopwareCheckoutFailed($this);
     }
 
-    /**
-     * Get the issuers for the iDEAL payment method.
-     * Called in an ajax call on the frontend.
-     */
-    public function idealIssuersAction()
-    {
-        Shopware()->Plugins()->Controller()->ViewRenderer()->setNoRender();
-
-        try {
-            $this->loadServices();
-
-            $customer = $this->customers->getCurrent();
-
-            if (!$customer instanceof Customer) {
-                throw new \Exception('No active customer found for iDEAL AJAX list');
-            }
-
-            /** @var array $idealIssuers */
-            $idealIssuers = $this->iDEAL->getIssuers($customer);
-
-            $this->sendResponse([
-                'data' => $idealIssuers,
-                'success' => true,
-            ]);
-        } catch (\Exception $ex) {
-            $this->logger->error(
-                'Error iDEAL issuer AJAX action.',
-                [
-                    'error' => $ex->getMessage(),
-                ]
-            );
-
-            $this->sendResponse(
-                [
-                    'message' => $ex->getMessage(),
-                    'success' => false
-                ],
-                500
-            );
-        }
-    }
 
     /**
      *
@@ -588,7 +543,7 @@ private function loadServices()
             $paymentService = Shopware()->Container()->get('mollie_shopware.payment_service');
             $orderService = Shopware()->Container()->get('mollie_shopware.order_service');
 
-            $this->iDEAL = $this->container->get('mollie_shopware.components.ideal');
+
             $this->customers = $this->container->get('mollie_shopware.customer');
 
 

diff --git a/Gateways/Mollie/MollieGateway.php b/Gateways/Mollie/MollieGateway.php
@@ -128,31 +128,6 @@ public function getPayment($paymentId)
         return $payment;
     }
 
-    /**
-     * @throws \Mollie\Api\Exceptions\ApiException
-     * @return Issuer[]
-     */
-    public function getIdealIssuers()
-    {
-        $paymentMethods = $this->apiClient->methods->allActive(
-            [
-                'include' => 'issuers'
-            ]
-        );
-
-        $issuers = [];
-
-        foreach ($paymentMethods as $paymentMethod) {
-            if ($paymentMethod->id === PaymentMethod::IDEAL) {
-                foreach ($paymentMethod->issuers() as $key => $issuer) {
-                    $issuers[] = $issuer;
-                }
-                break;
-            }
-        }
-
-        return $issuers;
-    }
 
     /**
      * @param array $requestData

diff --git a/Gateways/MollieGatewayInterface.php b/Gateways/MollieGatewayInterface.php
@@ -3,7 +3,6 @@
 namespace MollieShopware\Gateways;
 
 use Mollie\Api\MollieApiClient;
-use Mollie\Api\Resources\Issuer;
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Resources\Shipment;
@@ -38,10 +37,7 @@ public function getOrder($orderId);
      */
     public function getPayment($paymentId);
 
-    /**
-     * @return Issuer[]
-     */
-    public function getIdealIssuers();
+
 
     /**
      * @param array $requestData

diff --git a/Resources/services/subscriber.xml b/Resources/services/subscriber.xml
@@ -14,12 +14,7 @@
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="mollie_shopware.subscriber.ideal_issuers" class="MollieShopware\Subscriber\IdealIssuersSubscriber">
-            <argument type="service" id="mollie_shopware.ideal_service"/>
-            <argument type="service" id="mollie_shopware.customer"/>
-            <argument type="service" id="mollie_shopware.components.logger"/>
-            <tag name="shopware.event_subscriber"/>
-        </service>
+
 
         <service id="mollie_shopware.subscriber.credit_card_token"
                  class="MollieShopware\Subscriber\CreditCardTokenSubscriber">

diff --git a/Resources/views/frontend/plugins/payment/mollie_ideal.tpl b/Resources/views/frontend/plugins/payment/mollie_ideal.tpl