Merge pull request #1154 from buckaroo-it/develop

Update, Test & Release (1.51.0)

.github/workflows/icons.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Copy payment method icons
         run: |
             cd "${{ github.workspace }}/Media/Payment methods/SVG/"
-            rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg
+            rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg giropay.svg sofort.svg
             cd ${{ github.workspace }}/Media
             cp -R "Payment methods/SVG/." ${{ github.workspace }}/view/base/web/images/svg/
       - name: Copy creditcards icons
@@ -35,7 +35,7 @@ jobs:
             rm -f vvvlekkerweg.svg vvvshopchill.svg
             cd ${{ github.workspace }}/Media
             cp -R "Giftcards/SVG/." ${{ github.workspace }}/view/base/web/images/giftcards/
-            
+
       - name: Copy payment issuers icons
         run: |
             cd Media

Block/Adminhtml/Sales/Totals.php

@@ -55,15 +55,9 @@ public function __construct(
     public function initTotals()
     {
         $parent = $this->getParentBlock();
-        /**
-        * @noinspection PhpUndefinedMethodInspection
-        */
         $source = $parent->getSource();
         $totals = $this->getTotalsForCreditmemo($source);
         foreach ($totals as $total) {
-            /**
-            * @noinspection PhpUndefinedMethodInspection
-            */
             $this->getParentBlock()->addTotalBefore(new \Magento\Framework\DataObject($total), 'grand_total');
         }
         return $this;
@@ -72,12 +66,9 @@ public function initTotals()
     public function getTotals()
     {
         $parent = $this->getParentBlock();
-        /**
-        * @noinspection PhpUndefinedMethodInspection
-        */
         $source = $parent->getSource();
 
-        
+
         return $this->getTotalsForCreditmemo($source);
     }
 
@@ -92,7 +83,7 @@ public function getCurrentCurrencySymbol()
     }
 
     /**
-     * For credit memo display the fees from invoice/order, 
+     * For credit memo display the fees from invoice/order,
      * check if invoice has that fee and set selected
      *
      * @param mixed $source
@@ -107,7 +98,7 @@ protected function getTotalsForCreditmemo($source)
             $invoice = $source->getInvoice();
             $salesModel = ($invoice != null? $invoice : $order);
             $saleTotals = $this->helper->getTotals($salesModel);
-            
+
             $saleTotals = array_map(function($saleTotal) use($creditTotals) {
                 if (in_array($saleTotal['code'],['buckaroo_fee', 'buckaroo_fee_excl'] )) {
                     $saleTotal['block_name'] = "buckaroo_fee";
@@ -116,12 +107,12 @@ protected function getTotalsForCreditmemo($source)
                 return $saleTotal;
             }, $saleTotals);
 
-            
+
             return array_merge(
                 $this->getTotalsByCode($creditTotals, 'buckaroo_already_paid'),
                 $this->getTotalsExceptCode($saleTotals, 'buckaroo_already_paid')
             );
-            
+
         }
         return $this->helper->getTotals($source);
     }

Block/Cart/BuckarooConfig.php

@@ -1,37 +1,58 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
+ * 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 support@buckaroo.nl 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 support@buckaroo.nl for more information.
+ *
+ * @copyright Copyright (c) Buckaroo B.V.
+ * @license   https://tldrlegal.com/license/mit-license
  */
+
 namespace Buckaroo\Magento2\Block\Cart;
 
-class BuckarooConfig extends \Magento\Backend\Block\Template
+use Buckaroo\Magento2\Exception;
+use Buckaroo\Magento2\Model\ConfigProvider\Factory;
+use Magento\Backend\Block\Template;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class BuckarooConfig extends Template
 {
     /**
      * @var bool
      */
     protected $_isScopePrivate = false;
 
     /**
-     * @var \Buckaroo\Magento2\Model\ConfigProvider\Factory
+     * @var Factory
      */
     protected $configProviderFactory;
 
     /**
-     * @var \Magento\Framework\Json\Encoder
+     * @var Json
      */
     protected $jsonEncoder;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context    $context
-     * @param \Magento\Framework\Json\Encoder            $jsonEncoder
-     * @param \Buckaroo\Magento2\Model\ConfigProvider\Factory $configProviderFactory
-     * @param array                                      $data
+     * @param Context $context
+     * @param Json $jsonEncoder
+     * @param Factory $configProviderFactory
+     * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\Json\Encoder $jsonEncoder,
-        \Buckaroo\Magento2\Model\ConfigProvider\Factory $configProviderFactory,
+        Context $context,
+        Json $jsonEncoder,
+        Factory $configProviderFactory,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -42,11 +63,22 @@ public function __construct(
     /**
      * Retrieve buckaroo configuration
      *
-     * @return array
+     * @return string
+     * @throws Exception
      */
     public function getBuckarooConfigJson()
     {
         $configProvider = $this->configProviderFactory->get('buckaroo_fee');
-        return $this->jsonEncoder->encode($configProvider->getConfig());
+        return $this->jsonEncoder->serialize($configProvider->getConfig());
+    }
+
+    /**
+     * Get CSP nonce
+     *
+     * @return string
+     */
+    public function getCspNonce()
+    {
+        return $this->getData('cspNonce') ?: '';
     }
 }

Block/Catalog/Product/View/Applepay.php

@@ -21,6 +21,7 @@
 
 use Magento\Checkout\Model\Cart;
 use Magento\Checkout\Model\CompositeConfigProvider;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Buckaroo\Magento2\Model\ConfigProvider\Method\Applepay as ApplepayConfig;
@@ -58,13 +59,22 @@ public function __construct(
     }
 
     /**
+     * @param $page
      * @return bool
+     * @throws NoSuchEntityException
      */
-    public function canShowButton($page)
+    public function canShowButton($page): bool
     {
-        return $this->isModuleActive() &&
-            in_array($page, $this->applepayConfigProvider->getAvailableButtons()) &&
-            $this->applepayConfigProvider->isApplePayEnabled($this->_storeManager->getStore());
+        if (!$this->isModuleActive()) {
+            return false;
+        }
+
+        $availableButtons = $this->applepayConfigProvider->getAvailableButtons();
+        if (!in_array($page, $availableButtons, true)) {
+            return false;
+        }
+
+        return $this->applepayConfigProvider->isApplePayEnabled($this->_storeManager->getStore());
     }
 
     /**

Block/Checkout/Success.php

@@ -28,7 +28,7 @@ class Success extends \Magento\Checkout\Block\Onepage\Success
     protected $currentCustomer;
 
     /**
-     * @param Template\Context $context
+     * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Framework\App\Http\Context $httpContext
@@ -52,4 +52,14 @@ public function __construct(
         );
         $this->currentCustomer = $currentCustomer;
     }
+
+    /**
+     * Get CSP nonce
+     *
+     * @return string
+     */
+    public function getCspNonce()
+    {
+        return $this->getData('cspNonce') ?: '';
+    }
 }

Block/Info.php

@@ -107,7 +107,6 @@ public function getPaymentLogo(string $method): string
             "mrcash" => "svg/bancontact.svg",
             "p24" => "svg/przelewy24.svg",
             "sepadirectdebit" => "svg/sepa-directdebit.svg",
-            "sofortbanking" => "svg/sofort.svg",
             "emandate" => "emandate.png",
             "pospayment" => "pos.png",
             "transfer" => "svg/sepa-credittransfer.svg",

Block/Widget/Button/Toolbar.php

@@ -45,11 +45,9 @@ class Toolbar
         'buckaroo_magento2_paypal',
         'buckaroo_magento2_payconiq',
         'buckaroo_magento2_sepadirectdebit',
-        'buckaroo_magento2_sofortbanking',
         'buckaroo_magento2_belfius',
         'buckaroo_magento2_transfer',
         'buckaroo_magento2_eps',
-        'buckaroo_magento2_giropay',
         'buckaroo_magento2_kbc',
         'buckaroo_magento2_klarna',
         'buckaroo_magento2_klarnakp',

Controller/Applepay/SaveOrder.php

@@ -20,6 +20,8 @@
 namespace Buckaroo\Magento2\Controller\Applepay;
 
 use Buckaroo\Magento2\Logging\Log;
+use Buckaroo\Magento2\Model\Config\Source\InvoiceHandlingOptions;
+use Buckaroo\Magento2\Model\ConfigProvider\Account;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\Page;
@@ -35,6 +37,7 @@ class SaveOrder extends Common
     protected $order;
     protected $checkoutSession;
     protected $accountConfig;
+    private $configAccount;
 
     /**
      * @param Context     $context
@@ -47,6 +50,7 @@ public function __construct(
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         Log $logger,
         \Magento\Checkout\Model\Cart $cart,
+        Account $configAccount,
         \Magento\Quote\Model\QuoteManagement $quoteManagement,
         \Magento\Customer\Model\Session $customer,
         \Magento\Framework\DataObjectFactory $objectFactory,
@@ -69,7 +73,7 @@ public function __construct(
             $converter,
             $customerSession
         );
-
+        $this->configAccount               = $configAccount;
         $this->quoteManagement = $quoteManagement;
         $this->customer = $customer;
         $this->objectFactory = $objectFactory;
@@ -126,6 +130,14 @@ public function execute()
                 $payment->setMethod(Applepay::PAYMENT_METHOD_CODE);
                 $quote->setPayment($payment);
 
+
+                $invoiceHandlingConfig = $this->configAccount->getInvoiceHandling($this->order->getStore());
+
+                if ($invoiceHandlingConfig == InvoiceHandlingOptions::SHIPMENT) {
+                    $payment->setAdditionalInformation(InvoiceHandlingOptions::INVOICE_HANDLING, $invoiceHandlingConfig);
+                    $payment->save();
+                    $quote->setPayment($payment);
+                }
                 $quote->collectTotals()->save();
 
                 $obj = $this->objectFactory->create();