get hotfix changes

Api/Data/QuoteCreateResponseInterface.php

@@ -19,8 +19,6 @@
  */
 namespace Buckaroo\Magento2\Api\Data;
 
-use Buckaroo\Magento2\Api\Data\BreakdownItemInterface;
-
 interface QuoteCreateResponseInterface extends BreakdownItemInterface
 {
     /**
@@ -36,4 +34,4 @@ public function getBreakdown();
      * @return string
      */
     public function getCartId();
-}
+}

Api/IdealQuoteCreateInterface.php

@@ -21,17 +21,14 @@
 
 namespace Buckaroo\Magento2\Api;
 
-use Buckaroo\Magento2\Api\Data\QuoteCreateResponseInterface;
-use Buckaroo\Magento2\Api\Data\Ideal\ShippingAddressRequestInterface;
-
 interface IdealQuoteCreateInterface
 {
     /**
      * Get order breakdown after shipping is applied
      *
      * @param string $page
      * @param string|null $order_data
-     * @return QuoteCreateResponseInterface
+     * @return \Buckaroo\Magento2\Api\Data\QuoteCreateResponseInterface
      */
     public function execute(
         string $page,

Api/PayWithGiftcardInterface.php

@@ -23,15 +23,14 @@
 
 use Buckaroo\Magento2\Api\Data\Giftcard\PayRequestInterface;
 
-interface PayWithGiftcardInterface 
+interface PayWithGiftcardInterface
 {
     /**
      * Rest method for paying with giftcards
      *
      * @param string $cartId
      * @param string $giftcardId
-     * @param \Buckaroo\Magento2\Api\Data\Giftcard\PayRequestInterface $requestBody
-     *
+     * @param \Buckaroo\Magento2\Api\Data\Giftcard\PayRequestInterface $payment
      * @return \Buckaroo\Magento2\Api\Data\Giftcard\PayResponseInterface
      */
     public function pay(string $cartId, string $giftcardId, PayRequestInterface $payment);

Api/PaypalExpressQuoteCreateInterface.php

@@ -22,7 +22,6 @@
 namespace Buckaroo\Magento2\Api;
 
 use Buckaroo\Magento2\Api\Data\PaypalExpress\ShippingAddressRequestInterface;
-use Buckaroo\Magento2\Api\Data\QuoteCreateResponseInterface;
 
 interface PaypalExpressQuoteCreateInterface
 {
@@ -32,7 +31,7 @@ interface PaypalExpressQuoteCreateInterface
    * @param \Buckaroo\Magento2\Api\Data\PaypalExpress\ShippingAddressRequestInterface $shipping_address
    * @param string $page
    * @param string|null $order_data
-   * @return QuoteCreateResponseInterface
+   * @return \Buckaroo\Magento2\Api\Data\QuoteCreateResponseInterface
  */
   public function execute(
     ShippingAddressRequestInterface $shipping_address,

Block/Catalog/Product/View/Applepay.php

@@ -60,52 +60,29 @@ public function __construct(
     /**
      * @return bool
      */
-    public function canShowButton()
+    public function canShowButton($page)
     {
-        $result = false;
-
-        if ($this->cart->getSummaryQty()
-            &&
-            ($this->applepayConfigProvider->getActive() != 0)
-            &&
-            ($this->applepayConfigProvider->getAvailableButtons())
-            &&
-            (in_array('Cart', $this->applepayConfigProvider->getAvailableButtons()))
-        ) {
-            $result = true;
-        }
-
-        return $result;
+        return $this->isModuleActive() &&
+            in_array($page, $this->applepayConfigProvider->getAvailableButtons()) &&
+            $this->applepayConfigProvider->isApplePayEnabled($this->_storeManager->getStore());
     }
 
     /**
+     * Check if Buckaroo module is active
+     *
      * @return bool
      */
-    public function canShowProductButton()
+    public function isModuleActive()
     {
-        $result = false;
-
-        if (($this->applepayConfigProvider->getActive() != 0)
-            &&
-            ($this->applepayConfigProvider->getAvailableButtons())
-            &&
-            (in_array('Product', $this->applepayConfigProvider->getAvailableButtons()))
-        ) {
-            $result = true;
-        }
-
-        return $result;
+        $status = $this->applepayConfigProvider->getActive();
+        return $status == 1 || $status == 2;
     }
 
     /**
      * @return false|string
      */
     public function getCheckoutConfig()
     {
-        if (!$this->canShowButton()) {
-            return null;
-        }
-
         return json_encode($this->compositeConfigProvider->getConfig(), JSON_HEX_TAG);
     }
 

Block/Catalog/Product/View/IdealFastCheckout.php

@@ -69,31 +69,12 @@ public function __construct(
      *
      * @return bool
      */
-    public function canShowProductButton()
+    public function canShowButton($page)
     {
-        if ($this->isModuleActive() && $this->isButtonEnabled()){
-            return $this->idealConfig->canShowButtonForPage(
-                'Product',
-                $this->_storeManager->getStore()
-            );
-        }
-        return false;
-    }
-
-    /**
-     * Determine if the cart button can be shown
-     *
-     * @return bool
-     */
-    public function canShowCartButton()
-    {
-        if ($this->isModuleActive() && $this->isButtonEnabled()){
-            return $this->idealConfig->canShowButtonForPage(
-                'Cart',
-                $this->_storeManager->getStore()
-            );
-        }
-        return false;
+        return ($this->isModuleActive() &&
+            $this->idealConfig->isFastCheckoutEnabled($this->_storeManager->getStore()) &&
+            $this->idealConfig->canShowButtonForPage($page, $this->_storeManager->getStore()) &&
+            $this->idealConfig->isIDealEnabled($this->_storeManager->getStore()));
     }
 
     /**
@@ -107,19 +88,6 @@ public function isModuleActive()
         return $status == 1 || $status == 2;
     }
 
-    /**
-     * Check if ideal fast checkout button is enabled
-     *
-     * @return mixed
-     */
-    public function isButtonEnabled()
-    {
-        return $this->idealConfig->isFastCheckoutEnabled(
-            $this->_storeManager->getStore()
-        );
-    }
-
-
     /**
      * Get logo based on chosen color setting
      *

Block/Catalog/Product/View/PaypalExpress.php

@@ -56,26 +56,11 @@ public function __construct(
         $this->encryptor = $encryptor;
         $this->paypalConfig = $paypalConfig;
     }
-    public function canShowProductButton()
+    public function canShowButton($page)
     {
-        if ($this->isModuleActive()){
-            return $this->paypalConfig->canShowButtonForPage(
-                'Product',
-                $this->_storeManager->getStore()
-            );
-        }
-        return false;
-    }
-
-    public function canShowCartButton()
-    {
-        if ($this->isModuleActive()){
-            return $this->paypalConfig->canShowButtonForPage(
-                'Cart',
-                $this->_storeManager->getStore()
-            );
-        }
-        return false;
+        return $this->isModuleActive() &&
+            $this->paypalConfig->canShowButtonForPage($page, $this->_storeManager->getStore()) &&
+            $this->paypalConfig->isPayPalEnabled($this->_storeManager->getStore());
     }
 
     /**
@@ -88,6 +73,7 @@ public function isModuleActive()
         $status = $this->configProviderAccount->getActive();
         return $status == 1 || $status == 2;
     }
+
     /**
      * Get all data required
      *

Block/Widget/Button/Toolbar.php

@@ -49,7 +49,6 @@ class Toolbar
         'buckaroo_magento2_belfius',
         'buckaroo_magento2_transfer',
         'buckaroo_magento2_eps',
-        'buckaroo_magento2_giropay',
         'buckaroo_magento2_kbc',
         'buckaroo_magento2_klarna',
         'buckaroo_magento2_klarnakp',

Controller/Redirect/Process.php

@@ -330,13 +330,16 @@ private function redirectProcess() {
                         || $paymentMethod->getConfigData('order_email', $store) === "1"
                     )
                 ) {
-                    if (!($this->hasPostData('add_initiated_by_magento', 1) &&
-                        $this->hasPostData('brq_primary_service', 'KlarnaKp') &&
-                        $this->hasPostData('add_service_action_from_magento', 'reserve') &&
-                        !empty($this->response['brq_service_klarnakp_reservationnumber'])
+                    if (!(
+                        ($this->hasPostData('add_initiated_by_magento', 1) &&
+                            $this->hasPostData('brq_primary_service', 'KlarnaKp') &&
+                            $this->hasPostData('add_service_action_from_magento', 'reserve') &&
+                            !empty($this->response['brq_service_klarnakp_reservationnumber']))
+                        ||
+                        $this->hasPostData('add_service_action_from_magento', 'payfastcheckout')
                     )) {
                         if ($statusCode == $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_SUCCESS')) {
-                            $this->logger->addDebug(__METHOD__ . '|sendemail|');
+                            $this->logger->addDebug(__METHOD__ . '|sendemail| |1|');
                             $this->orderSender->send($this->order, true);
                         }
                     }

Helper/Data.php

@@ -384,7 +384,7 @@ public function areEqualAmounts($amount1, $amount2)
         if ($amount2 == 0) {
             return $amount1 == $amount2;
         } else {
-            return abs((floatval($amount1) - floatval($amount2)) / floatval($amount2)) < 0.00001;
+            return abs((floatval($amount1) - floatval($amount2)) / floatval($amount2)) <= 0.01;
         }
     }
 
@@ -433,7 +433,6 @@ public function getPaymentMethodsList()
             ['value' => 'emandate',       'label' => __('Digital Debit Authorization')],
             ['value' => 'eps',       'label' => __('EPS')],
             ['value' => 'giftcards',       'label' => __('Giftcards')],
-            ['value' => 'giropay',       'label' => __('Giropay')],
             ['value' => 'ideal',       'label' => __('iDEAL')],
             ['value' => 'idealprocessing',       'label' => __('iDEAL Processing')],
             ['value' => 'kbc',       'label' => __('KBC')],

Model/Config/Source/PaymentMethods/AfterExpiry.php

@@ -37,7 +37,6 @@ public function toOptionArray()
             ['value' => 'dankort',                'label' => __('Dankort')],
             ['value' => 'eps',                    'label' => __('EPS')],
             ['value' => 'giftcard',               'label' => __('Giftcards')],
-            ['value' => 'giropay',                'label' => __('Giropay')],
             ['value' => 'ideal',                  'label' => __('iDEAL')],
             ['value' => 'idealprocessing',        'label' => __('iDEAL Processing')],
             ['value' => 'maestro',                'label' => __('Maestro')],

Model/Config/Source/PaymentMethods/PayLink.php

@@ -38,7 +38,6 @@ public function toOptionArray()
             ['value' => 'dankort',                'label' => __('Dankort')],
             ['value' => 'eps',                    'label' => __('EPS')],
             ['value' => 'giftcard',               'label' => __('Giftcards')],
-            ['value' => 'giropay',                'label' => __('Giropay')],
             ['value' => 'ideal',                  'label' => __('iDEAL')],
             ['value' => 'idealprocessing',        'label' => __('iDEAL Processing')],
             ['value' => 'maestro',                'label' => __('Maestro')],

Model/Config/Source/PaymentMethods/PayPerEmail.php

@@ -70,11 +70,6 @@ public function toOptionArray()
                 'label' => __('Giftcards'),
                 'code' => 'buckaroo_magento2_giftcards'
             ],
-            [
-                'value' => 'giropay',
-                'label' => __('Giropay'),
-                'code' => 'buckaroo_magento2_giropay'
-            ],
             [
                 'value' => 'ideal',
                 'label' => __('iDEAL'),

Model/ConfigProvider/Method/Applepay.php

@@ -170,4 +170,8 @@ public function getBaseAllowedCurrencies()
         ];
     }
 
+    public function isApplePayEnabled($store = null)
+    {
+        return $this->getConfigFromXpath(self::XPATH_APPLEPAY_ACTIVE, $store);
+    }
 }