buckaroo-it · harli91 · Sep 7, 2023 · Apr 10, 2023 · Apr 11, 2023 · Apr 11, 2023
diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml
@@ -21,7 +21,9 @@ jobs:
             php  ./rename-icons.php
       - name: Copy payment method icons
         run: |
-            cd Media
+            cd "${{ github.workspace }}/Media/Payment methods/SVG/"
+            rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg
+            cd ${{ github.workspace }}/Media
             cp -R "Payment methods/SVG/." ${{ github.workspace }}/view/adminhtml/web/images/svg/
             cp -R "Payment methods/SVG/." ${{ github.workspace }}/view/frontend/web/images/svg/
       - name: Copy creditcards icons
@@ -31,9 +33,12 @@ jobs:
             cp -R "Creditcard issuers/SVG/." ${{ github.workspace }}/view/frontend/web/images/creditcards/
       - name: Copy giftcards icons
         run: |
-            cd Media
+            cd "${{ github.workspace }}/Media/Giftcards/SVG/"
+            rm -f vvvlekkerweg.svg vvvshopchill.svg
+            cd ${{ github.workspace }}/Media
             cp -R "Giftcards/SVG/." ${{ github.workspace }}/view/adminhtml/web/images/giftcards/
             cp -R "Giftcards/SVG/." ${{ github.workspace }}/view/frontend/web/images/giftcards/
+
       - name: Copy payment issuers icons
         run: |
             cd Media

diff --git a/Block/Config/Form/Field/LogoSelector.php b/Block/Config/Form/Field/LogoSelector.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the MIT License
+ * It is available through the world-wide-web at this URL:
+ * https://tldrlegal.com/license/mit-license
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact [email protected] for more information.
+ *
+ * @copyright Copyright (c) Buckaroo B.V.
+ * @license   https://tldrlegal.com/license/mit-license
+ */
+namespace Buckaroo\Magento2\Block\Config\Form\Field;
+
+use \Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+class LogoSelector extends Field
+{
+    protected $_template = 'Buckaroo_Magento2::in3_logo.phtml';
+
+    protected  Repository $assetRepo;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Context $context,
+        Repository $assetRepo,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        $this->assetRepo = $assetRepo;
+        parent::__construct($context, $data, $secureRenderer);
+    }
+
+    /**
+     * Return element html
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $element->setData('type', 'hidden');
+        $this->assign("input", $element->getElementHtml());
+        $this->assign("inputId",   $element->getHtmlId());
+        $this->assign("inputValue",   $element->getEscapedValue());
+        return $this->_toHtml();
+    }
+
+    public function getLogos(): array
+    {
+        return [
+            "in3.svg" => $this->assetRepo->getUrl("Buckaroo_Magento2::images/svg/in3.svg"),
+            "in3-ideal.svg" => $this->assetRepo->getUrl("Buckaroo_Magento2::images/svg/in3-ideal.svg")
+        ]; 
+    }
+}
diff --git a/Block/Info.php b/Block/Info.php
@@ -104,7 +104,8 @@ public function getPaymentLogo(string $method): string
             "sofortbanking" => "svg/sofort.svg",
             "emandate" => "emandate.png",
             "pospayment" => "pos.png",
-            "transfer" => "svg/sepa-credittransfer.svg"
+            "transfer" => "svg/sepa-credittransfer.svg",
+            "paybybank" => "paybybank.gif"
         ];
 
         $name = "svg/{$method}.svg";

diff --git a/Controller/Redirect/Process.php b/Controller/Redirect/Process.php
@@ -310,6 +310,7 @@ public function execute()
                     );
                     $this->logger->addDebug(__METHOD__ . '|5|');
 
+                    $this->removeCoupon();
                     $this->removeAmastyGiftcardOnFailed();
 
                     return $this->handleProcessedResponse('/');
@@ -429,6 +430,7 @@ protected function handleFailed($statusCode)
 
         $this->eventManager->dispatch('buckaroo_process_handle_failed_before');
 
+        $this->removeCoupon();
         $this->removeAmastyGiftcardOnFailed();
 
         if (!$this->getSkipHandleFailedRecreate()) {
@@ -723,6 +725,32 @@ public function setSkipHandleFailedRecreate($value)
         return true;
     }
 
+    /**
+     * Remove coupon from failed order if magento enterprise
+     * 
+     * @return void
+     */
+    protected function removeCoupon()
+    {
+        if (method_exists($this->order,'getCouponCode')) {
+            $couponCode = $this->order->getCouponCode();
+            $couponFactory = $this->_objectManager->get(\Magento\SalesRule\Model\CouponFactory::class);
+            if (!(is_object($couponFactory) && method_exists($couponFactory, 'load'))) {
+                return;
+            }
+
+            $coupon = $couponFactory->load($couponCode, 'code');
+            $resourceModel = $this->_objectManager->get(\Magento\SalesRule\Model\Spi\CouponResourceInterface::class);
+            if (!(is_object($resourceModel) && method_exists($resourceModel, 'delete'))) {
+                return;
+            }
+
+            if (is_int($coupon->getCouponId())) {
+                $resourceModel->delete($coupon);
+            }
+        }
+    }
+
     /**
      * Remove amasty giftcard from failed order
      *

diff --git a/Gateway/Http/TransactionBuilderFactory.php b/Gateway/Http/TransactionBuilderFactory.php
@@ -75,7 +75,7 @@ public function get($builderType)
             );
         }
 
-        $transactionBuilder = $this->objectManager->get($transactionBuilderClass);
+        $transactionBuilder = $this->objectManager->create($transactionBuilderClass);
         if (!$transactionBuilder instanceof TransactionBuilderInterface) {
             throw new \LogicException(
                 'The transaction builder must implement "Buckaroo\Magento2\Gateway\Http\TransactionBuilderInterface".'

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -246,10 +246,10 @@ public function getMode($paymentMethod = null, $store = null)
      */
     public function isMobile()
     {
-        $useragent = $_SERVER['HTTP_USER_AGENT'];
+        $userAgent = $this->httpHeader->getHttpUserAgent();
         return preg_match(
-            '/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$useragent)||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',
-            substr($useragent,0,4)
+            '/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$userAgent)||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',
+            substr($userAgent,0,4)
         );
     }
 
@@ -425,8 +425,8 @@ public function getPaymentMethodsList()
             ['value' => 'applepay',       'label' => __('Apple Pay')],
             ['value' => 'billink',       'label' => __('Billink')],
             ['value' => 'capayablein3',       'label' => __('In3')],
-            ['value' => 'creditcard',       'label' => __('Creditcards')],
-            ['value' => 'creditcards',       'label' => __('Creditcards (Client sided)')],
+            ['value' => 'creditcard',       'label' => __('Credit and debit cards')],
+            ['value' => 'creditcards',       'label' => __('Credit and debit cards (Client sided)')],
             ['value' => 'emandate',       'label' => __('Digital Debit Authorization')],
             ['value' => 'eps',       'label' => __('EPS')],
             ['value' => 'giftcards',       'label' => __('Giftcards')],

diff --git a/Model/Checks/CanUseForCountry/CountryProvider.php b/Model/Checks/CanUseForCountry/CountryProvider.php
diff --git a/Model/Config/Source/In3ApiVersions.php b/Model/Config/Source/In3ApiVersions.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the MIT License
+ * It is available through the world-wide-web at this URL:
+ * https://tldrlegal.com/license/mit-license
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact [email protected] for more information.
+ *
+ * @copyright Copyright (c) Buckaroo B.V.
+ * @license   https://tldrlegal.com/license/mit-license
+ */
+
+namespace Buckaroo\Magento2\Model\Config\Source;
+
+class In3ApiVersions implements \Magento\Framework\Data\OptionSourceInterface
+{
+    public const VERSION_3 = 'V3';
+    public const VERSION_2 = 'V2';
+
+    /**
+     * Options getter
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => self::VERSION_3, 'label' => __('V3 (In3)')],
+            ['value' => self::VERSION_2, 'label' => __('V2 (Capayable/In2)')]
+        ];
+    }
+}
diff --git a/Model/ConfigProvider/Method/AbstractConfigProvider.php b/Model/ConfigProvider/Method/AbstractConfigProvider.php
@@ -120,6 +120,11 @@ abstract class AbstractConfigProvider extends BaseAbstractConfigProvider impleme
             'code' => 'BITSNL2A',
             'imgName' => 'yoursafe'
         ],
+        [
+            'name' => 'N26',
+            'code' => 'NTSBDEB1',
+            'imgName' => 'n26'
+        ],
     ];
 
     /**
@@ -181,7 +186,7 @@ public function getIssuers()
      */
     protected function formatIssuers()
     {
-        $issuers = array_map(
+        return array_map(
             function ($issuer) {
                 if(isset($issuer['imgName'])) {
                     $issuer['img'] = $this->getImageUrl("ideal/{$issuer['imgName']}", "svg");
@@ -190,8 +195,6 @@ function ($issuer) {
             },
             $this->getIssuers()
         );
-
-        return $issuers;
     }
 
     public function getCreditcardLogo(string $code): string

diff --git a/Model/ConfigProvider/Method/Applepay.php b/Model/ConfigProvider/Method/Applepay.php
@@ -146,4 +146,22 @@ public function getAvailableButtons()
 
         return $availableButtons;
     }
+
+    /**
+     * @return array
+     */
+    public function getBaseAllowedCurrencies()
+    {
+        return [
+            'EUR',
+            'USD',
+            'GBP',
+            'DKK',
+            'NOK',
+            'SEK',
+            'CHF',
+            'PLN'
+        ];
+    }
+
 }
diff --git a/Model/ConfigProvider/Method/CapayableIn3.php b/Model/ConfigProvider/Method/CapayableIn3.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * NOTICE OF LICENSE
  *
@@ -40,6 +41,10 @@ class CapayableIn3 extends AbstractConfigProvider
     const XPATH_CAPAYABLEIN3_ORDER_EMAIL          = 'payment/buckaroo_magento2_capayablein3/order_email';
     const XPATH_CAPAYABLEIN3_AVAILABLE_IN_BACKEND = 'payment/buckaroo_magento2_capayablein3/available_in_backend';
 
+    const XPATH_CAPAYABLEIN3_API_VERSION = 'payment/buckaroo_magento2_capayablein3/api_version';
+    const XPATH_CAPAYABLEIN3_PAYMENT_LOGO = 'payment/buckaroo_magento2_capayablein3/payment_logo';
+
+
     const XPATH_ALLOWED_CURRENCIES = 'payment/buckaroo_magento2_capayablein3/allowed_currencies';
     const XPATH_ALLOW_SPECIFIC     = 'payment/buckaroo_magento2_capayablein3/allowspecific';
     const XPATH_SPECIFIC_COUNTRY   = 'payment/buckaroo_magento2_capayablein3/specificcountry';
@@ -75,6 +80,7 @@ public function getConfig()
                         'subtext_style'   => $this->getSubtextStyle(),
                         'subtext_color'   => $this->getSubtextColor(),
                         'allowedCurrencies' => $this->getAllowedCurrencies(),
+                        'logo' => $this->getLogo()
                     ],
                 ],
             ],
@@ -96,4 +102,27 @@ public function getPaymentFee($storeId = null)
 
         return $paymentFee ? $paymentFee : false;
     }
+
+    public function isV3($storeId = null): bool
+    {
+        return $this->scopeConfig->getValue(
+            self::XPATH_CAPAYABLEIN3_API_VERSION,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        ) !== 'V2';
+    }
+    public function getLogo($storeId = null): string
+    {
+        $logo = $this->scopeConfig->getValue(
+            self::XPATH_CAPAYABLEIN3_PAYMENT_LOGO,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        if (!is_string($logo) || !$this->isV3($storeId)) {
+            return 'in3.svg';
+        }
+
+        return $logo;
+    }
 }