From 4a0e6f38afbba9a2a714671564120f21a691c3c4 Mon Sep 17 00:00:00 2001
From: Lucian Turiac <lucian.turiac@arnia.ro>
Date: Mon, 15 Jan 2024 16:40:01 +0200
Subject: [PATCH] Fixing issues after merge with "develop"

---
 .../Request/Capayable/In3V3DataBuilder.php    |  2 +-
 Model/ConfigProvider/Method/Ideal.php         | 12 +++++++++
 Service/Ideal/IssuersService.php              |  1 -
 .../system/payment_methods/creditcard.xml     | 27 ++++++++++---------
 .../system/payment_methods/creditclick.xml    | 10 -------
 .../payment/buckaroo_magento2_creditcard.html |  9 +++++--
 6 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/Gateway/Request/Capayable/In3V3DataBuilder.php b/Gateway/Request/Capayable/In3V3DataBuilder.php
index 00696fb11..7244e56b3 100644
--- a/Gateway/Request/Capayable/In3V3DataBuilder.php
+++ b/Gateway/Request/Capayable/In3V3DataBuilder.php
@@ -53,7 +53,7 @@ public function build(array $buildSubject): array
 
         $data = [];
 
-        if ($this->capayableIn3Config->isV3()) {
+        if (!$this->capayableIn3Config->isV2()) {
             $payment->setAdditionalInformation("buckaroo_in3_v3", true);
             $data['payment_method'] = 'in3';
         }
diff --git a/Model/ConfigProvider/Method/Ideal.php b/Model/ConfigProvider/Method/Ideal.php
index 1d046548e..87d84d9d3 100644
--- a/Model/ConfigProvider/Method/Ideal.php
+++ b/Model/ConfigProvider/Method/Ideal.php
@@ -175,4 +175,16 @@ public function getImageUrl($imgName, string $extension = 'png')
     {
         return parent::getImageUrl("ideal/{$imgName}", "svg");
     }
+
+    public function getAllIssuers(): array
+    {
+        $issuers = $this->getIssuers();
+        $issuersPrepared = [];
+        foreach ($issuers as $issuer) {
+            $issuer['img'] = $issuer['logo'];
+            $issuersPrepared[$issuer['code']] = $issuer;
+        }
+
+        return $issuersPrepared;
+    }
 }
diff --git a/Service/Ideal/IssuersService.php b/Service/Ideal/IssuersService.php
index 86890f8a7..6991b7c0a 100644
--- a/Service/Ideal/IssuersService.php
+++ b/Service/Ideal/IssuersService.php
@@ -87,7 +87,6 @@ public function __construct(
     public function get(): array
     {
         $issuers = $this->getCachedIssuers();
-        $issuers = null;
         if ($issuers === null) {
             return $this->updateCacheIssuers();
         }
diff --git a/etc/adminhtml/system/payment_methods/creditcard.xml b/etc/adminhtml/system/payment_methods/creditcard.xml
index a3d941ee2..2cdc9f22e 100644
--- a/etc/adminhtml/system/payment_methods/creditcard.xml
+++ b/etc/adminhtml/system/payment_methods/creditcard.xml
@@ -74,19 +74,6 @@
 
         <group id="buckaroo_magento2_default" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Method specific configuration</label>
-            <field id="allowed_issuers" translate="label comment" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Allowed credit and debit cards</label>
-                <comment><![CDATA[Select payment method specific Credit and debit card.]]></comment>
-                <config_path>payment/buckaroo_magento2_creditcard/allowed_issuers</config_path>
-                <source_model>Buckaroo\Magento2\Model\Config\Source\Creditcard</source_model>
-            </field>
-
-            <field id="sorted_issuers" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Sort Credit-debitcard issuers</label>
-                <frontend_model>Buckaroo\Magento2\Block\Adminhtml\Form\Field\SortIssuers</frontend_model>
-                <comment><![CDATA[Select sort order on credit and debit card.]]></comment>
-                <config_path>payment/buckaroo_magento2_creditcard/sorted_issuers</config_path>
-            </field>
 
             <group id="buckaroo_magento2_card_specific" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Card specific settings</label>
@@ -164,6 +151,20 @@
             <config_path>payment/buckaroo_magento2_creditcards/selection_type</config_path>
         </field>
 
+        <field id="allowed_issuers" translate="label comment" type="multiselect" sortOrder="56" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Allowed credit and debit cards</label>
+            <comment><![CDATA[Select payment method specific Credit and debit card.]]></comment>
+            <config_path>payment/buckaroo_magento2_creditcard/allowed_issuers</config_path>
+            <source_model>Buckaroo\Magento2\Model\Config\Source\Creditcard</source_model>
+        </field>
+
+        <field id="sorted_issuers" translate="label comment" type="text" sortOrder="57" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Sort Credit-debitcard issuers</label>
+            <frontend_model>Buckaroo\Magento2\Block\Adminhtml\Form\Field\SortIssuers</frontend_model>
+            <comment><![CDATA[Select sort order on credit and debit card.]]></comment>
+            <config_path>payment/buckaroo_magento2_creditcard/sorted_issuers</config_path>
+        </field>
+
         <group id="buckaroo_magento2_advanced" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced Configuration</label>
 
diff --git a/etc/adminhtml/system/payment_methods/creditclick.xml b/etc/adminhtml/system/payment_methods/creditclick.xml
index ac3b9247c..6ed078a40 100644
--- a/etc/adminhtml/system/payment_methods/creditclick.xml
+++ b/etc/adminhtml/system/payment_methods/creditclick.xml
@@ -76,16 +76,6 @@ For precise cost details, please reach out to <a href="mailto:wecare@buckaroo.nl
         <group id="buckaroo_magento2_advanced" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced Configuration</label>
 
-            <field id="sorted_issuers" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Sort iDEAL banks</label>
-                <frontend_model>Buckaroo\Magento2\Block\Adminhtml\Form\Field\SortIssuers</frontend_model>
-                <comment><![CDATA[Select sort order iDEAL Processing Issuers.]]></comment>
-                <depends>
-                    <field id="show_issuers">1</field>
-                </depends>
-                <config_path>payment/buckaroo_magento2_creditclick/sorted_issuers</config_path>
-            </field>
-
             <field id="order_email" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Send order confirmation email</label>
                 <comment><![CDATA[Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.]]></comment>
diff --git a/view/frontend/web/template/payment/buckaroo_magento2_creditcard.html b/view/frontend/web/template/payment/buckaroo_magento2_creditcard.html
index 54b3f2dca..b8e536342 100644
--- a/view/frontend/web/template/payment/buckaroo_magento2_creditcard.html
+++ b/view/frontend/web/template/payment/buckaroo_magento2_creditcard.html
@@ -135,8 +135,13 @@
                         <!-- ko text: name --><!-- /ko -->
                     </label>
                 </div>
-                <div class="bk-img-wrap">
-                    <img data-bind="attr: { src: img }"/>
+                <div class="bk-mode-and-img">
+                    <!-- ko if: $parent.isTestMode -->
+                    <div class="bk-test-mode"><div class="bk-test-text" data-bind="i18n: 'Test Mode'"></div></div>
+                    <!-- /ko -->
+                    <div class="bk-img-wrap">
+                        <img data-bind="attr: { src: img, alt: name }" />
+                    </div>
                 </div>
             </div>
         </div>