';
+ return $html;
+ }
+}
diff --git a/Controller/Checkout/FastCheckoutProduct.php b/Controller/Checkout/FastCheckoutProduct.php
new file mode 100644
index 00000000..6f812ce1
--- /dev/null
+++ b/Controller/Checkout/FastCheckoutProduct.php
@@ -0,0 +1,115 @@
+resolverInterface = $resolverInterface;
+ $this->payHelper = $payHelper;
+
+ return parent::__construct(
+ $context,
+ $scopeConfig,
+ $checkoutSession,
+ $storeManager,
+ $formKeyValidator,
+ $cart,
+ $productRepository,
+ $quantityProcessor
+ );
+ }
+
+ /**
+ * Add product to shopping cart action
+ *
+ * @return \Magento\Framework\Controller\Result\Redirect
+ */
+ public function execute()
+ {
+ try {
+ if (!$this->_formKeyValidator->validate($this->getRequest())) {
+ throw new \Exception("Session has expired");
+ }
+
+ $params = $this->getRequest()->getParams();
+
+ if (isset($params['qty'])) {
+ $filter = new LocalizedToNormalized(
+ ['locale' => $this->resolverInterface->getLocale()]
+ );
+ $params['qty'] = $filter->filter($params['qty']);
+ }
+
+ $product = $this->_initProduct();
+ $related = $this->getRequest()->getParam('related_product');
+
+ if (!$product) {
+ throw new \Exception("Product not found");
+ }
+
+ $this->cart->addProduct($product, $params);
+ if (!empty($related)) {
+ $this->cart->addProductsByIds(explode(',', $related));
+ }
+ $this->cart->save();
+
+ $this->_eventManager->dispatch(
+ 'checkout_cart_add_product_complete',
+ ['product' => $product, 'request' => $this->getRequest(), 'response' => $this->getResponse()]
+ );
+
+ $baseUrl = $this->_url->getBaseUrl();
+ return $this->goBack($baseUrl . 'paynl/checkout/fastcheckoutstart/');
+
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ $this->payHelper->logCritical('FC Product ERROR: ' . $e->getMessage(), []);
+ if ($this->_checkoutSession->getUseNotice(true)) {
+ $this->messageManager->addNoticeMessage($e->getMessage());
+ }
+
+ return $this->goBack();
+ } catch (\Exception $e) {
+ $this->payHelper->logCritical('FC Product ERROR: ' . $e->getMessage(), []);
+ $this->messageManager->addExceptionMessage($e, __('We can\'t add this item to your shopping cart right now.'));
+
+ return $this->goBack();
+ }
+ }
+}
diff --git a/Controller/Checkout/FastCheckoutStart.php b/Controller/Checkout/FastCheckoutStart.php
index 3b427281..80cb93c5 100644
--- a/Controller/Checkout/FastCheckoutStart.php
+++ b/Controller/Checkout/FastCheckoutStart.php
@@ -7,6 +7,7 @@
use Magento\Customer\Model\CustomerFactory;
use Magento\Framework\App\Action\Context;
use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Quote\Api\ShippingMethodManagementInterface;
use Magento\Store\Model\StoreManagerInterface;
use Paynl\Payment\Helper\PayHelper;
use Paynl\Payment\Model\PayPaymentCreateFastCheckout;
@@ -46,6 +47,11 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
*/
private $customerRepository;
+ /**
+ * @var ShippingMethodManagementInterface
+ */
+ private $shippingMethodManagementInterface;
+
/**
* @param Context $context
* @param Cart $cart
@@ -54,6 +60,7 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
* @param StoreManagerInterface $storeManager
* @param CustomerFactory $customerFactory
* @param CustomerRepositoryInterface $customerRepository
+ * @param ShippingMethodManagementInterface $shippingMethodManagementInterface
*/
public function __construct(
Context $context,
@@ -62,7 +69,8 @@ public function __construct(
PayHelper $payHelper,
StoreManagerInterface $storeManager,
CustomerFactory $customerFactory,
- CustomerRepositoryInterface $customerRepository
+ CustomerRepositoryInterface $customerRepository,
+ ShippingMethodManagementInterface $shippingMethodManagementInterface
) {
$this->cart = $cart;
$this->paymentHelper = $paymentHelper;
@@ -70,6 +78,7 @@ public function __construct(
$this->payHelper = $payHelper;
$this->customerFactory = $customerFactory;
$this->customerRepository = $customerRepository;
+ $this->shippingMethodManagementInterface = $shippingMethodManagementInterface;
return parent::__construct($context);
}
@@ -84,26 +93,6 @@ private function quoteSetDummyData($quote)
$store = $this->storeManager->getStore();
$websiteId = $store->getWebsiteId();
- $email = 'fastcheckout@pay.nl';
- $customer = $this->customerFactory->create()
- ->setWebsiteId($websiteId)
- ->loadByEmail($email);
-
- if (!$customer->getEntityId()) {
- $customer->setWebsiteId($websiteId)
- ->setStore($store)
- ->setFirstname('firstname')
- ->setLastname('lastname')
- ->setEmail($email)
- ->setPassword($email);
- $customer->save();
- }
-
- $customer = $this->customerRepository->getById($customer->getEntityId());
-
- $quote->assignCustomer($customer);
- $quote->setSendConfirmation(1);
-
$dummyData = array(
'customer_address_id' => '',
'prefix' => '',
@@ -123,20 +112,35 @@ private function quoteSetDummyData($quote)
'telephone' => 'phone',
'fax' => '',
'vat_id' => '',
- 'save_in_address_book' => 0,
+ 'save_in_address_book' => 1,
);
$billingAddress = $quote->getBillingAddress()->addData($dummyData);
$shippingAddress = $quote->getShippingAddress()->addData($dummyData);
+ $quote->save();
+
$shippingAddress = $quote->getShippingAddress();
- $shippingAddress->setCollectShippingRates(true)->collectShippingRates()->setShippingMethod($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping'));
+ $shippingAddress->setCollectShippingRates(true)->collectShippingRates();
- $quote->setPaymentMethod('paynl_payment_ideal');
- $quote->setInventoryProcessed(false);
- $quote->save();
+ $shippingData = $this->shippingMethodManagementInterface->getList($quote->getId());
+ $shippingMethodsAvaileble = [];
+ foreach ($shippingData as $shipping) {
+ $code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
+ $shippingMethodsAvaileble[$code] = $code;
+ }
+
+ if (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
+ }
+
+ if (empty($shippingMethod)) {
+ throw new \Exception("No shipping method availeble");
+ }
- $quote->getPayment()->importData(['method' => 'paynl_payment_ideal']);
+ $shippingAddress->setShippingMethod($shippingMethod);
$quote->collectTotals()->save();
}
@@ -213,14 +217,13 @@ public function execute()
$this->getResponse()->setNoCacheHeaders();
$this->getResponse()->setRedirect($payTransaction->getRedirectUrl());
} catch (\Exception $e) {
- $message = __('Something went wrong, please try again later');
+ $message = __('Unfortunately fast checkout is currently not possible.');
if ($e->getCode() == FastCheckoutStart::FC_EMPTY_BASKET) {
$message = __('Please put something in the basket');
} else {
$this->payHelper->logCritical('FC ERROR: ' . $e->getMessage(), []);
}
-
- $this->messageManager->addExceptionMessage($e, $message);
+ $this->messageManager->addNoticeMessage($message);
$this->_redirect('checkout/cart');
}
}
diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php
index f70f7ded..34be2f0b 100644
--- a/Controller/Checkout/Finish.php
+++ b/Controller/Checkout/Finish.php
@@ -3,7 +3,6 @@
namespace Paynl\Payment\Controller\Checkout;
use Magento\Checkout\Model\Session;
-use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Event\ManagerInterface;
use Magento\Quote\Model\QuoteFactory;
@@ -138,8 +137,8 @@ public function execute()
$resultRedirect = $this->resultRedirectFactory->create();
$params = $this->getRequest()->getParams();
$payOrderId = empty($params['orderId']) ? (empty($params['orderid']) ? null : $params['orderid']) : $params['orderId'];
- $orderStatusId = empty($params['orderStatusId']) ? null : (int)$params['orderStatusId'];
- $orderStatusId = (empty($orderStatusId) && !empty($params['statusCode'])) ? (int)$params['statusCode'] : $orderStatusId;
+ $orderStatusId = empty($params['orderStatusId']) ? null : (int) $params['orderStatusId'];
+ $orderStatusId = (empty($orderStatusId) && !empty($params['statusCode'])) ? (int) $params['statusCode'] : $orderStatusId;
$magOrderId = empty($params['entityid']) ? null : $params['entityid'];
$orderIds = empty($params['order_ids']) ? null : $params['order_ids'];
$pickupMode = !empty($params['pickup']);
@@ -158,14 +157,18 @@ public function execute()
} elseif ($bPending) {
$resultRedirect->setPath(Config::PENDING_PAY, ['_query' => ['utm_nooverride' => '1']]);
} else {
- $resultRedirect->setPath(Config::CANCEL_PAY, ['_query' => ['utm_nooverride' => '1']]);
+ $resultRedirect->setPath('checkout/cart', ['_query' => ['utm_nooverride' => '1']]);
}
+ $session = $this->checkoutSession;
+ $quote = $session->getQuote();
if ($bSuccess || $bPending) {
- $session = $this->checkoutSession;
- $quote = $session->getQuote();
$quote->setIsActive(false);
$this->quoteRepository->save($quote);
+ } else {
+ $quote->setIsActive(true);
+ $this->quoteRepository->save($quote);
+ $session->replaceQuote($quote);
}
return $resultRedirect;
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/PayPaymentCreateFastCheckoutOrder.php
index 47d75654..b7b7ea69 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/PayPaymentCreateFastCheckoutOrder.php
@@ -4,6 +4,7 @@
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Model\CustomerFactory;
+use Magento\Quote\Api\ShippingMethodManagementInterface;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteManagement;
use Magento\Sales\Model\OrderFactory;
@@ -46,6 +47,11 @@ class PayPaymentCreateFastCheckoutOrder
*/
protected $orderRepository;
+ /**
+ * @var ShippingMethodManagementInterface
+ */
+ private $shippingMethodManagementInterface;
+
/**
* @param StoreManagerInterface $storeManager
* @param QuoteFactory $quote
@@ -53,6 +59,7 @@ class PayPaymentCreateFastCheckoutOrder
* @param CustomerFactory $customerFactory
* @param CustomerRepositoryInterface $customerRepository
* @param OrderFactory $orderFactory
+ * @param ShippingMethodManagementInterface $shippingMethodManagementInterface
*/
public function __construct(
StoreManagerInterface $storeManager,
@@ -60,7 +67,8 @@ public function __construct(
QuoteManagement $quoteManagement,
CustomerFactory $customerFactory,
CustomerRepositoryInterface $customerRepository,
- OrderFactory $orderFactory
+ OrderFactory $orderFactory,
+ ShippingMethodManagementInterface $shippingMethodManagementInterface
) {
$this->storeManager = $storeManager;
$this->quote = $quote;
@@ -68,6 +76,7 @@ public function __construct(
$this->customerFactory = $customerFactory;
$this->customerRepository = $customerRepository;
$this->orderFactory = $orderFactory;
+ $this->shippingMethodManagementInterface = $shippingMethodManagementInterface;
}
/**
@@ -163,7 +172,26 @@ public function create($params)
));
$shippingAddress = $quote->getShippingAddress();
- $shippingAddress->setCollectShippingRates(true)->collectShippingRates()->setShippingMethod($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping'));
+ $shippingAddress->setCollectShippingRates(true)->collectShippingRates();
+
+ $shippingData = $this->shippingMethodManagementInterface->getList($quote->getId());
+ $shippingMethodsAvailable = [];
+ foreach ($shippingData as $shipping) {
+ $code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
+ $shippingMethodsAvailable[$code] = $code;
+ }
+
+ if (!empty($shippingMethodsAvailable[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
+ } elseif (!empty($shippingMethodsAvailable[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
+ }
+
+ if (empty($shippingMethod)) {
+ throw new \Exception("No shipping method availeble");
+ }
+
+ $shippingAddress->setShippingMethod($shippingMethod);
$quote->setPaymentMethod('paynl_payment_ideal');
$quote->setInventoryProcessed(false);
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 6c01b1ce..0a000bce 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -148,29 +148,49 @@ Business, BB2: Only show this payment method when the customer entered a company
payment/paynl_payment_ideal/showforgroup
-
-
-
- Paynl\Payment\Model\Config\Source\OffOn
- payment/paynl_payment_ideal/fast_checkout_enabled
-
- 1
-
- Allows users to checkout directly from the cart without the need to fill in their address.
-
-
-
- Paynl\Payment\Model\Config\Source\ActiveShippingMethods
- payment/paynl_payment_ideal/fast_checkout_shipping
-
- 1
- 1
-
-
+
+
+
+
+
+ Paynl\Payment\Model\Config\Source\OffOn
+ payment/paynl_payment_ideal/fast_checkout_cart_enabled
+
+ 1
+
+ Allows users to checkout directly from the cart without the need to fill in their address.
+
+
+
+ Paynl\Payment\Model\Config\Source\OffOn
+ payment/paynl_payment_ideal/fast_checkout_product_enabled
+
+ 1
+
+ Allows users to checkout directly from the product page without the need to fill in their address.
+
+
+
+ Paynl\Payment\Block\Adminhtml\Render\CacheButton
+
+
+
+ Paynl\Payment\Model\Config\Source\ActiveShippingMethods
+ payment/paynl_payment_ideal/fast_checkout_shipping
+
+ 1
+
+
+
+
+ Paynl\Payment\Model\Config\Source\ActiveShippingMethods
+ payment/paynl_payment_ideal/fast_checkout_shipping_backup
+
+ 1
+
+ In case the selected default method is not applicable to the order the backup shiping method will be used.
+
+
+
+
+
+
+ Paynl\Payment\ViewModel\FastCheckout
+
+
+
+
+
+
+ Paynl\Payment\ViewModel\FastCheckout
+
+
+
+
+
\ No newline at end of file
diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
index 44b86acc..483a3d86 100644
--- a/view/frontend/layout/checkout_cart_index.xml
+++ b/view/frontend/layout/checkout_cart_index.xml
@@ -2,7 +2,7 @@
-
+ Paynl\Payment\ViewModel\FastCheckout
diff --git a/view/frontend/templates/pay_fast_checkout_cart.phtml b/view/frontend/templates/pay_fast_checkout_cart.phtml
index 34b3a9be..cbc26a46 100644
--- a/view/frontend/templates/pay_fast_checkout_cart.phtml
+++ b/view/frontend/templates/pay_fast_checkout_cart.phtml
@@ -3,7 +3,7 @@
/** @var \Paynl\Payment\Block\Checkout\FastCheckout $block */
?>
-
+
-
+
\ No newline at end of file
diff --git a/view/frontend/templates/pay_fast_checkout_product.phtml b/view/frontend/templates/pay_fast_checkout_product.phtml
new file mode 100644
index 00000000..ce00e4b1
--- /dev/null
+++ b/view/frontend/templates/pay_fast_checkout_product.phtml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/view/frontend/templates/pay_finish_fc.phtml b/view/frontend/templates/pay_finish_fc.phtml
index f53999a3..bffd021c 100644
--- a/view/frontend/templates/pay_finish_fc.phtml
+++ b/view/frontend/templates/pay_finish_fc.phtml
@@ -11,7 +11,7 @@
getAdditionalInfoHtml() ?>
-
+
diff --git a/view/frontend/web/css/payFastCheckout.css b/view/frontend/web/css/payFastCheckout.css
index e76ced4b..714ab1c6 100644
--- a/view/frontend/web/css/payFastCheckout.css
+++ b/view/frontend/web/css/payFastCheckout.css
@@ -3,7 +3,15 @@
width: 100%;
}
+#paynl_fast_checkout_product {
+ display: block;
+ margin-bottom: 0;
+ margin-right: 1%;
+ width: 49%;
+}
+
#paynl_fast_checkout_cart button,
+#paynl_fast_checkout_product button,
#top-cart-fast-checkout {
width: 100%;
line-height: 2.2rem;
@@ -16,4 +24,4 @@
background-repeat: no-repeat;
background-size: 51px;
background-position: 8px center;
-}
\ No newline at end of file
+}
diff --git a/view/frontend/web/js/fast-checkout-product-view.js b/view/frontend/web/js/fast-checkout-product-view.js
new file mode 100644
index 00000000..6d0bb326
--- /dev/null
+++ b/view/frontend/web/js/fast-checkout-product-view.js
@@ -0,0 +1,17 @@
+define([
+ 'jquery'
+], function ($) {
+ 'use strict';
+
+ return function (config, element) {
+ $(element).click(function () {
+ var form = $(element.form),
+ baseUrl = form.attr('action'),
+ fastCheckoutUrl = baseUrl.replace('checkout/cart/add', 'paynl/checkout/fastcheckoutproduct');
+ form.attr('action', fastCheckoutUrl);
+ form.trigger('submit');
+ form.attr('action', baseUrl);
+ return false;
+ });
+ }
+});
\ No newline at end of file
diff --git a/view/frontend/web/js/reloadCart.js b/view/frontend/web/js/reloadCart.js
new file mode 100644
index 00000000..134efb83
--- /dev/null
+++ b/view/frontend/web/js/reloadCart.js
@@ -0,0 +1,12 @@
+define([
+ 'jquery',
+ 'Magento_Customer/js/customer-data'
+], function ($,customerData) {
+ 'use strict';
+
+ return function (config, element) {
+ var sections = ['cart'];
+ customerData.invalidate(sections);
+ customerData.reload(sections, true);
+ }
+});
\ No newline at end of file
From bed99bfa1d2128310c649aa68c204bef471e0de3 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Mon, 5 Aug 2024 16:39:51 +0200
Subject: [PATCH 11/47] Code Polish
---
Controller/Checkout/FastCheckoutProduct.php | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Controller/Checkout/FastCheckoutProduct.php b/Controller/Checkout/FastCheckoutProduct.php
index 6f812ce1..f8b39bae 100644
--- a/Controller/Checkout/FastCheckoutProduct.php
+++ b/Controller/Checkout/FastCheckoutProduct.php
@@ -28,6 +28,15 @@ class FastCheckoutProduct extends \Magento\Checkout\Controller\Cart\Add
/**
* @param Context $context
+ * @param ResolverInterface $resolverInterface
+ * @param PayHelper $payHelper
+ * @param ScopeConfigInterface $scopeConfig
+ * @param Session $checkoutSession
+ * @param StoreManagerInterface $storeManager
+ * @param Validator $formKeyValidator
+ * @param CustomerCart $cart
+ * @param ProductRepositoryInterface $productRepository
+ * @param RequestQuantityProcessor $quantityProcessor
*/
public function __construct(
Context $context,
@@ -96,8 +105,8 @@ public function execute()
);
$baseUrl = $this->_url->getBaseUrl();
- return $this->goBack($baseUrl . 'paynl/checkout/fastcheckoutstart/');
+ return $this->goBack($baseUrl . 'paynl/checkout/fastcheckoutstart/');
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$this->payHelper->logCritical('FC Product ERROR: ' . $e->getMessage(), []);
if ($this->_checkoutSession->getUseNotice(true)) {
From 293682339107f70e7ab0c874a00c27d7e48163b3 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:07:36 +0200
Subject: [PATCH 12/47] Add guest checkout only setting
---
ViewModel/FastCheckout.php | 30 +++++++++++++++----
etc/adminhtml/paymentmethods/ideal.xml | 6 ++++
.../templates/pay_fast_checkout_cart.phtml | 22 +++++++-------
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/ViewModel/FastCheckout.php b/ViewModel/FastCheckout.php
index ae0c5906..5e0b318b 100644
--- a/ViewModel/FastCheckout.php
+++ b/ViewModel/FastCheckout.php
@@ -2,23 +2,43 @@
namespace Paynl\Payment\ViewModel;
-use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Session;
class FastCheckout implements ArgumentInterface
{
/**
- * @var ScopeConfigInterface
+ * @var StoreManagerInterface
*/
- protected $scopeConfig;
+ protected $storeManager;
+
+ /**
+ * @var Session
+ */
+ protected $session;
/**
* BuyNow constructor.
* @param ScopeConfigInterface $scopeConfig
*/
public function __construct(
- ScopeConfigInterface $scopeConfig
+ StoreManagerInterface $storeManager,
+ Session $session
) {
- $this->scopeConfig = $scopeConfig;
+ $this->storeManager = $storeManager;
+ $this->session = $session;
+ }
+
+ /**
+ * @return string
+ */
+ public function getVisibility()
+ {
+ $store = $this->storeManager->getStore();
+ if($this->session->isLoggedIn() && $store->getConfig('payment/paynl_payment_ideal/fast_checkout_guest_only') == 1) {
+ return false;
+ }
+ return true;
}
}
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 0a000bce..a66a6867 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -190,6 +190,12 @@ Business, BB2: Only show this payment method when the customer entered a company
In case the selected default method is not applicable to the order the backup shiping method will be used.
+
+
+ Paynl\Payment\Block\Adminhtml\Render\Checkbox
+ payment/paynl_payment_ideal/fast_checkout_guest_only
+ Only shows the fast checkout button on cart page for guest users.
+
diff --git a/view/frontend/templates/pay_fast_checkout_cart.phtml b/view/frontend/templates/pay_fast_checkout_cart.phtml
index cbc26a46..4c4d5ddf 100644
--- a/view/frontend/templates/pay_fast_checkout_cart.phtml
+++ b/view/frontend/templates/pay_fast_checkout_cart.phtml
@@ -1,14 +1,16 @@
getViewModel();
?>
-
-
-
-
\ No newline at end of file
+getVisibility()): ?>
+
+
+
+
\ No newline at end of file
From 2bfb3d642d29fb2958530bc682ee42ac0f388539 Mon Sep 17 00:00:00 2001
From: woutse
Date: Wed, 7 Aug 2024 11:22:00 +0200
Subject: [PATCH 13/47] Updated texts
---
Block/Adminhtml/Render/CacheButton.php | 2 +-
etc/adminhtml/paymentmethods/ideal.xml | 34 ++++++++++++++++----------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/Block/Adminhtml/Render/CacheButton.php b/Block/Adminhtml/Render/CacheButton.php
index d9521eb2..6a32c6f9 100644
--- a/Block/Adminhtml/Render/CacheButton.php
+++ b/Block/Adminhtml/Render/CacheButton.php
@@ -39,7 +39,7 @@ public function render(AbstractElement $element)
$currentUrl = $this->urlInterface->getCurrentUrl();
$payUrl = str_replace("system_config/edit/section/paynl_paymentmethods", "cache", $currentUrl);
- $text = __('After enabling fast checkout on product page please flush the cache') . ' ' . __('here') . '.';
+ $text = __('When updating this setting, please flush Magento\'s cache afterwards ') . ' ' . __('here') . '.';
$html = '
';
$html .= '
' . $text . '
';
$html .= '
';
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index a66a6867..2a5da955 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -148,53 +148,62 @@ Business, BB2: Only show this payment method when the customer entered a company
payment/paynl_payment_ideal/showforgroup
-
+
-
+
Paynl\Payment\Model\Config\Source\OffOnpayment/paynl_payment_ideal/fast_checkout_cart_enabled1
- Allows users to checkout directly from the cart without the need to fill in their address.
+ Show the fastcheckout button on the cart page.
+
+This button allows users to checkout directly from the cart without the need to fill in their address.
-
+
Paynl\Payment\Model\Config\Source\OffOnpayment/paynl_payment_ideal/fast_checkout_product_enabled1
- Allows users to checkout directly from the product page without the need to fill in their address.
+ Show the fastcheckout button on every product page.
+
+This button allows users to checkout directly from the cart without the need to fill in their address.Paynl\Payment\Block\Adminhtml\Render\CacheButton
-
+
-
+
Paynl\Payment\Model\Config\Source\ActiveShippingMethodspayment/paynl_payment_ideal/fast_checkout_shipping
- 1
+ 1
+ Select the shipping method that should be applied first.
-
+
Paynl\Payment\Model\Config\Source\ActiveShippingMethodspayment/paynl_payment_ideal/fast_checkout_shipping_backup
- 1
+ 1
- In case the selected default method is not applicable to the order the backup shiping method will be used.
+ Select the fallback shipping method, which will be applied when the default shipping method could not be applied.
+ In case the priority shipping method could not by applied, this shiping method will be used.Paynl\Payment\Block\Adminhtml\Render\Checkboxpayment/paynl_payment_ideal/fast_checkout_guest_only
- Only shows the fast checkout button on cart page for guest users.
+ When enabled, the fastCheckout button will only be shown on the cart page for guest users.
+
+This setting does not effect the product page. If fastCheckout is enabled for the product page, the fastCheckout button will always be shown.
+ Show the fastCheckout button on cart, only for guest customers.
@@ -209,4 +218,3 @@ Business, BB2: Only show this payment method when the customer entered a company
-
\ No newline at end of file
From c59fac388f3d608c0b933e6728420f47975762be Mon Sep 17 00:00:00 2001
From: woutse
Date: Wed, 7 Aug 2024 11:24:20 +0200
Subject: [PATCH 14/47] Updated texts
---
etc/adminhtml/paymentmethods/ideal.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 2a5da955..4229d078 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -203,7 +203,7 @@ This button allows users to checkout directly from the cart without the need to
When enabled, the fastCheckout button will only be shown on the cart page for guest users.
This setting does not effect the product page. If fastCheckout is enabled for the product page, the fastCheckout button will always be shown.
- Show the fastCheckout button on cart, only for guest customers.
+ Show the fastCheckout button on the cart page, only for guest customers.
From e816a31caa1d27433ddc81fda92b819f81dd96e4 Mon Sep 17 00:00:00 2001
From: woutse
Date: Wed, 7 Aug 2024 11:25:28 +0200
Subject: [PATCH 15/47] Updated texts
---
etc/adminhtml/paymentmethods/ideal.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 4229d078..87293874 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -194,7 +194,7 @@ This button allows users to checkout directly from the cart without the need to
1Select the fallback shipping method, which will be applied when the default shipping method could not be applied.
- In case the priority shipping method could not by applied, this shiping method will be used.
+ In case the default shipping method could not by applied, this shiping method will be used.
From c0bfbede7c3f061453c1387499a3c325c9a2f14d Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:31:17 +0200
Subject: [PATCH 16/47] Add estimate shipping selection
---
Controller/Checkout/FastCheckoutStart.php | 53 ++++++++++---------
Model/PayPaymentCreateFastCheckoutOrder.php | 12 +++--
etc/adminhtml/paymentmethods/ideal.xml | 9 ++++
.../templates/pay_fast_checkout_cart.phtml | 10 ++--
.../web/js/fast-checkout-cart-view.js | 16 ++++++
5 files changed, 68 insertions(+), 32 deletions(-)
create mode 100644 view/frontend/web/js/fast-checkout-cart-view.js
diff --git a/Controller/Checkout/FastCheckoutStart.php b/Controller/Checkout/FastCheckoutStart.php
index 80cb93c5..bfbeeb2d 100644
--- a/Controller/Checkout/FastCheckoutStart.php
+++ b/Controller/Checkout/FastCheckoutStart.php
@@ -3,8 +3,6 @@
namespace Paynl\Payment\Controller\Checkout;
use Magento\Checkout\Model\Cart;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\CustomerFactory;
use Magento\Framework\App\Action\Context;
use Magento\Payment\Helper\Data as PaymentHelper;
use Magento\Quote\Api\ShippingMethodManagementInterface;
@@ -16,6 +14,8 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
{
public const FC_GENERAL_ERROR = 8000;
public const FC_EMPTY_BASKET = 8005;
+ public const FC_ESITMATE_ERROR = 8006;
+ public const FC_SHIPPING_ERROR = 8006;
/**
* @var Cart
@@ -37,16 +37,6 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
*/
private $storeManager;
- /**
- * @var CustomerFactory
- */
- private $customerFactory;
-
- /**
- * @var CustomerRepositoryInterface
- */
- private $customerRepository;
-
/**
* @var ShippingMethodManagementInterface
*/
@@ -58,8 +48,6 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
* @param PaymentHelper $paymentHelper
* @param PayHelper $payHelper
* @param StoreManagerInterface $storeManager
- * @param CustomerFactory $customerFactory
- * @param CustomerRepositoryInterface $customerRepository
* @param ShippingMethodManagementInterface $shippingMethodManagementInterface
*/
public function __construct(
@@ -68,16 +56,12 @@ public function __construct(
PaymentHelper $paymentHelper,
PayHelper $payHelper,
StoreManagerInterface $storeManager,
- CustomerFactory $customerFactory,
- CustomerRepositoryInterface $customerRepository,
ShippingMethodManagementInterface $shippingMethodManagementInterface
) {
$this->cart = $cart;
$this->paymentHelper = $paymentHelper;
$this->storeManager = $storeManager;
$this->payHelper = $payHelper;
- $this->customerFactory = $customerFactory;
- $this->customerRepository = $customerRepository;
$this->shippingMethodManagementInterface = $shippingMethodManagementInterface;
return parent::__construct($context);
@@ -88,7 +72,7 @@ public function __construct(
* @return void
* @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
*/
- private function quoteSetDummyData($quote)
+ private function quoteSetDummyData($quote, $params)
{
$store = $this->storeManager->getStore();
$websiteId = $store->getWebsiteId();
@@ -106,9 +90,9 @@ private function quoteSetDummyData($quote)
'1' => 'streetnumber',
),
'city' => 'city',
- 'country_id' => 'NL',
+ 'country_id' => $params['selected_estimate_country'] ?? 'NL',
'region' => '',
- 'postcode' => '1234AB',
+ 'postcode' => $params['selected_estimate_zip'] ?? '1234AB',
'telephone' => 'phone',
'fax' => '',
'vat_id' => '',
@@ -130,7 +114,15 @@ private function quoteSetDummyData($quote)
$shippingMethodsAvaileble[$code] = $code;
}
- if (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
+ if (empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']])) {
+ throw new \Exception('Shipping method not availeble', FastCheckoutStart::FC_SHIPPING_ERROR);
+ }
+ }
+
+ if (isset($params['selected_estimate_shipping']) && !empty($params['selected_estimate_shipping']) && !empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']]) && $store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') > 0) {
+ $shippingMethod = $params['selected_estimate_shipping'];
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
$shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
} elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
$shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
@@ -189,14 +181,21 @@ public function execute()
{
try {
$methodInstance = $this->paymentHelper->getMethodInstance('paynl_payment_ideal');
-
$store = $this->storeManager->getStore();
- if (empty($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping'))) {
+ $params = $this->getRequest()->getParams();
+
+ if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
+ if (isset($params['selected_estimate_shipping']) && empty($params['selected_estimate_shipping'])) {
+ throw new \Exception('No estimate shipping method selected', FastCheckoutStart::FC_ESITMATE_ERROR);
+ }
+ }
+
+ if (empty($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')) && empty($params['selected_estimate_shipping'])) {
throw new \Exception('No shipping method selected', FastCheckoutStart::FC_GENERAL_ERROR);
}
$quote = $this->cart->getQuote();
- $this->quoteSetDummyData($quote);
+ $this->quoteSetDummyData($quote, $params);
$arrProducts = $this->getProducts();
$fcAmount = $this->cart->getQuote()->getGrandTotal();
@@ -220,6 +219,10 @@ public function execute()
$message = __('Unfortunately fast checkout is currently not possible.');
if ($e->getCode() == FastCheckoutStart::FC_EMPTY_BASKET) {
$message = __('Please put something in the basket');
+ } elseif ($e->getCode() == FastCheckoutStart::FC_ESITMATE_ERROR) {
+ $message = __('Please select a shipping method from the estimate.');
+ } elseif ($e->getCode() == FastCheckoutStart::FC_SHIPPING_ERROR) {
+ $message = __('Selected shipping method is not available.');
} else {
$this->payHelper->logCritical('FC ERROR: ' . $e->getMessage(), []);
}
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/PayPaymentCreateFastCheckoutOrder.php
index b7b7ea69..fbd84362 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/PayPaymentCreateFastCheckoutOrder.php
@@ -104,6 +104,8 @@ public function create($params)
$quote = $this->quote->create()->loadByIdWithoutStore($quoteId);
$storeId = $quote->getStoreId();
+ $shippingMethodQuote = $quote->getShippingAddress()->getShippingMethod();
+
$store = $this->storeManager->getStore($storeId);
$websiteId = $store->getWebsiteId();
@@ -175,15 +177,17 @@ public function create($params)
$shippingAddress->setCollectShippingRates(true)->collectShippingRates();
$shippingData = $this->shippingMethodManagementInterface->getList($quote->getId());
- $shippingMethodsAvailable = [];
+ $shippingMethodsAvaileble = [];
foreach ($shippingData as $shipping) {
$code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
- $shippingMethodsAvailable[$code] = $code;
+ $shippingMethodsAvaileble[$code] = $code;
}
- if (!empty($shippingMethodsAvailable[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ if (!empty($shippingMethodsAvaileble[$shippingMethodQuote])) {
+ $shippingMethod = $shippingMethodQuote;
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
$shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
- } elseif (!empty($shippingMethodsAvailable[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
$shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
}
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 87293874..9503932e 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -196,6 +196,15 @@ This button allows users to checkout directly from the cart without the need to
Select the fallback shipping method, which will be applied when the default shipping method could not be applied.In case the default shipping method could not by applied, this shiping method will be used.
+
+
+ Paynl\Payment\Model\Config\Source\UseEstimate
+ payment/paynl_payment_ideal/fast_checkout_use_estimate_selection
+
+ 1
+
+ When the user selects a shipping method in the estimate on the cart page, this shipping method wil be used for fast checkout.
+ Paynl\Payment\Block\Adminhtml\Render\Checkbox
diff --git a/view/frontend/templates/pay_fast_checkout_cart.phtml b/view/frontend/templates/pay_fast_checkout_cart.phtml
index 4c4d5ddf..2cca9869 100644
--- a/view/frontend/templates/pay_fast_checkout_cart.phtml
+++ b/view/frontend/templates/pay_fast_checkout_cart.phtml
@@ -3,12 +3,16 @@
/** @var \Paynl\Payment\Block\Checkout\FastCheckout $block */
$viewModel = $block->getViewModel();
?>
-getVisibility()): ?>
+getVisibility()): ?>
-
diff --git a/view/frontend/web/js/fast-checkout-cart-view.js b/view/frontend/web/js/fast-checkout-cart-view.js
new file mode 100644
index 00000000..cb9648d9
--- /dev/null
+++ b/view/frontend/web/js/fast-checkout-cart-view.js
@@ -0,0 +1,16 @@
+define([
+ 'jquery'
+], function ($) {
+ 'use strict';
+
+ return function (config, element) {
+ $(element).click(function () {
+ var form = $(element.form);
+ $('#selected_estimate_shipping').val($('#co-shipping-method-form input:checked').val());
+ $('#selected_estimate_country').val($('select[name="country_id"]').val());
+ $('#selected_estimate_zip').val($('input[name="postcode"]').val());
+ form.trigger('submit');
+ return false;
+ });
+ }
+});
\ No newline at end of file
From 04f75eeef532c814f0ba62f3ad117a4ba8b39121 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Thu, 8 Aug 2024 09:18:29 +0200
Subject: [PATCH 17/47] Add config file
---
Model/Config/Source/UseEstimate.php | 38 +++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 Model/Config/Source/UseEstimate.php
diff --git a/Model/Config/Source/UseEstimate.php b/Model/Config/Source/UseEstimate.php
new file mode 100644
index 00000000..842f1da3
--- /dev/null
+++ b/Model/Config/Source/UseEstimate.php
@@ -0,0 +1,38 @@
+toArray();
+
+ $arrResult = [];
+ foreach ($arrOptions as $value => $label) {
+ $arrResult[] = ['value' => $value, 'label' => $label];
+ }
+ return $arrResult;
+ }
+
+ /**
+ * Get options in "key-value" format
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ return [
+ 0 => __('Off'),
+ 1 => __('On - as Optional'),
+ 2 => __('On - as Required')
+ ];
+ }
+}
From 0dd596118354789ccd2e097e3f29ecb4b9a01b08 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:46:24 +0200
Subject: [PATCH 18/47] Add fallback setting
---
Block/Page/FastCheckoutFallback.php | 106 ++++++++++++++++++
Controller/Checkout/FastCheckoutFallback.php | 30 +++++
Controller/Checkout/FastCheckoutStart.php | 85 ++++++++++----
etc/adminhtml/paymentmethods/ideal.xml | 13 ++-
.../paynl_checkout_fastcheckoutfallback.xml | 25 +++++
.../pay_fast_checkout_fallback.phtml | 28 +++++
.../templates/pay_fast_checkout_product.phtml | 2 +-
view/frontend/web/css/payFastCheckout.css | 5 +
8 files changed, 270 insertions(+), 24 deletions(-)
create mode 100644 Block/Page/FastCheckoutFallback.php
create mode 100644 Controller/Checkout/FastCheckoutFallback.php
create mode 100644 view/frontend/layout/paynl_checkout_fastcheckoutfallback.xml
create mode 100644 view/frontend/templates/pay_fast_checkout_fallback.phtml
diff --git a/Block/Page/FastCheckoutFallback.php b/Block/Page/FastCheckoutFallback.php
new file mode 100644
index 00000000..85314d02
--- /dev/null
+++ b/Block/Page/FastCheckoutFallback.php
@@ -0,0 +1,106 @@
+addPageAsset('Paynl_Payment::css/payFastCheckout.css');
+ parent::__construct($context, $data);
+ $this->cart = $cart;
+ $this->request = $request;
+ $this->response = $response;
+ $this->cache = $cache;
+ $this->messageManager = $messageManager;
+ }
+
+ /**
+ * Initialize data and prepare it for output
+ *
+ * @return string
+ */
+ protected function _beforeToHtml() // phpcs:ignore
+
+ {
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * @return array
+ */
+ public function getShippingMethods()
+ {
+ $cacheName = 'shipping_methods_' . $this->cart->getQuote()->getId();
+ $shippingMethodJson = $this->cache->load($cacheName);
+
+ if (empty($shippingMethodJson)) {
+ $this->messageManager->addNoticeMessage(__('Unfortunately fast checkout is currently not possible.'));
+ $this->response->setRedirect('/checkout/cart');
+ } else {
+ return json_decode($shippingMethodJson);
+ }
+ }
+
+ /**
+ * @param string $param
+ * @return string|null
+ */
+ public function getParam($param)
+ {
+ $params = $this->request->getParams();
+ return (isset($params[$param])) ? $params[$param] : null;
+ }
+}
diff --git a/Controller/Checkout/FastCheckoutFallback.php b/Controller/Checkout/FastCheckoutFallback.php
new file mode 100644
index 00000000..35f59d68
--- /dev/null
+++ b/Controller/Checkout/FastCheckoutFallback.php
@@ -0,0 +1,30 @@
+_pageFactory = $pageFactory;
+ return parent::__construct($context);
+ }
+
+ /**
+ * @return object
+ */
+ public function execute()
+ {
+ return $this->_pageFactory->create();
+ }
+}
diff --git a/Controller/Checkout/FastCheckoutStart.php b/Controller/Checkout/FastCheckoutStart.php
index bfbeeb2d..52cbbcbe 100644
--- a/Controller/Checkout/FastCheckoutStart.php
+++ b/Controller/Checkout/FastCheckoutStart.php
@@ -4,6 +4,7 @@
use Magento\Checkout\Model\Cart;
use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\CacheInterface;
use Magento\Payment\Helper\Data as PaymentHelper;
use Magento\Quote\Api\ShippingMethodManagementInterface;
use Magento\Store\Model\StoreManagerInterface;
@@ -15,7 +16,7 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
public const FC_GENERAL_ERROR = 8000;
public const FC_EMPTY_BASKET = 8005;
public const FC_ESITMATE_ERROR = 8006;
- public const FC_SHIPPING_ERROR = 8006;
+ public const FC_SHIPPING_ERROR = 8007;
/**
* @var Cart
@@ -42,6 +43,11 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
*/
private $shippingMethodManagementInterface;
+ /**
+ * @var CacheInterface
+ */
+ public $cache;
+
/**
* @param Context $context
* @param Cart $cart
@@ -49,6 +55,7 @@ class FastCheckoutStart extends \Magento\Framework\App\Action\Action
* @param PayHelper $payHelper
* @param StoreManagerInterface $storeManager
* @param ShippingMethodManagementInterface $shippingMethodManagementInterface
+ * @param CacheInterface $cache
*/
public function __construct(
Context $context,
@@ -56,13 +63,15 @@ public function __construct(
PaymentHelper $paymentHelper,
PayHelper $payHelper,
StoreManagerInterface $storeManager,
- ShippingMethodManagementInterface $shippingMethodManagementInterface
+ ShippingMethodManagementInterface $shippingMethodManagementInterface,
+ CacheInterface $cache
) {
$this->cart = $cart;
$this->paymentHelper = $paymentHelper;
$this->storeManager = $storeManager;
$this->payHelper = $payHelper;
$this->shippingMethodManagementInterface = $shippingMethodManagementInterface;
+ $this->cache = $cache;
return parent::__construct($context);
}
@@ -114,22 +123,25 @@ private function quoteSetDummyData($quote, $params)
$shippingMethodsAvaileble[$code] = $code;
}
- if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
- if (empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']])) {
- throw new \Exception('Shipping method not availeble', FastCheckoutStart::FC_SHIPPING_ERROR);
+ if (isset($params['fallbackShippingMethod']) && !empty($params['fallbackShippingMethod']) && !empty($shippingMethodsAvaileble[$params['fallbackShippingMethod']])) {
+ $shippingMethod = $params['fallbackShippingMethod'];
+ } else {
+ if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
+ if (isset($params['selected_estimate_shipping']) && empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']])) {
+ throw new \Exception('Shipping method not availeble', FastCheckoutStart::FC_ESITMATE_ERROR);
+ }
+ }
+ if (isset($params['selected_estimate_shipping']) && !empty($params['selected_estimate_shipping']) && !empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']]) && $store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') > 0) {
+ $shippingMethod = $params['selected_estimate_shipping'];
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
}
- }
-
- if (isset($params['selected_estimate_shipping']) && !empty($params['selected_estimate_shipping']) && !empty($shippingMethodsAvaileble[$params['selected_estimate_shipping']]) && $store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') > 0) {
- $shippingMethod = $params['selected_estimate_shipping'];
- } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
- $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
- } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
- $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
}
if (empty($shippingMethod)) {
- throw new \Exception("No shipping method availeble");
+ throw new \Exception("No shipping method availeble", FastCheckoutStart::FC_SHIPPING_ERROR);
}
$shippingAddress->setShippingMethod($shippingMethod);
@@ -174,6 +186,29 @@ private function getProducts()
return $productArr;
}
+ /**
+ * @param quote $quote
+ * @return void
+ * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
+ */
+ public function cacheShippingMethods()
+ {
+ $quote = $this->cart->getQuote();
+ $rates = $quote->getShippingAddress()->getAllShippingRates();
+ $currency = $this->storeManager->getStore()->getCurrentCurrency();
+ $shippingRates = [];
+ foreach ($rates as $rate) {
+ $shippingRates[$rate->getCode()] = [
+ 'code' => $rate->getCode(),
+ 'method' => $rate->getCarrierTitle(),
+ 'title' => $rate->getMethodTitle(),
+ 'price' => number_format($rate->getPrice(), 2, '.', ''),
+ 'currency' => $currency->getCurrencySymbol(),
+ ];
+ }
+ $this->cache->save(json_encode($shippingRates), 'shipping_methods_' . $this->cart->getQuote()->getId());
+ }
+
/**
* @return void
*/
@@ -184,14 +219,16 @@ public function execute()
$store = $this->storeManager->getStore();
$params = $this->getRequest()->getParams();
- if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
- if (isset($params['selected_estimate_shipping']) && empty($params['selected_estimate_shipping'])) {
- throw new \Exception('No estimate shipping method selected', FastCheckoutStart::FC_ESITMATE_ERROR);
+ if (!isset($params['fallbackShippingMethod'])) {
+ if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_estimate_selection') == 2) {
+ if (isset($params['selected_estimate_shipping']) && empty($params['selected_estimate_shipping'])) {
+ throw new \Exception('No estimate shipping method selected', FastCheckoutStart::FC_ESITMATE_ERROR);
+ }
}
}
- if (empty($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')) && empty($params['selected_estimate_shipping'])) {
- throw new \Exception('No shipping method selected', FastCheckoutStart::FC_GENERAL_ERROR);
+ if (empty($store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')) && (!isset($params['fallbackShippingMethod']) || empty($params['fallbackShippingMethod'])) && (!isset($params['selected_estimate_shipping']) || empty($params['selected_estimate_shipping']))) {
+ throw new \Exception('No shipping method selected', FastCheckoutStart::FC_SHIPPING_ERROR);
}
$quote = $this->cart->getQuote();
@@ -226,8 +263,14 @@ public function execute()
} else {
$this->payHelper->logCritical('FC ERROR: ' . $e->getMessage(), []);
}
- $this->messageManager->addNoticeMessage($message);
- $this->_redirect('checkout/cart');
+
+ if ($store->getConfig('payment/paynl_payment_ideal/fast_checkout_use_fallback') == 1 && $e->getCode() == FastCheckoutStart::FC_SHIPPING_ERROR) {
+ $this->cacheShippingMethods();
+ $this->_redirect('paynl/checkout/fastcheckoutfallback');
+ } else {
+ $this->messageManager->addNoticeMessage($message);
+ $this->_redirect('checkout/cart');
+ }
}
}
}
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 9503932e..f7435be0 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -204,8 +204,17 @@ This button allows users to checkout directly from the cart without the need to
1When the user selects a shipping method in the estimate on the cart page, this shipping method wil be used for fast checkout.
-
-
+
+
+
+ Paynl\Payment\Model\Config\Source\OffOn
+ payment/paynl_payment_ideal/fast_checkout_use_fallback
+
+ 1
+
+ Allows users to select a shipping method themselves, in case the selected shipping method isn't available for the order.
+
+ Paynl\Payment\Block\Adminhtml\Render\Checkboxpayment/paynl_payment_ideal/fast_checkout_guest_only
diff --git a/view/frontend/layout/paynl_checkout_fastcheckoutfallback.xml b/view/frontend/layout/paynl_checkout_fastcheckoutfallback.xml
new file mode 100644
index 00000000..f3d2a9a3
--- /dev/null
+++ b/view/frontend/layout/paynl_checkout_fastcheckoutfallback.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ Fast Checkout Shipping
+
+
+
+
+
+ Fast Checkout Shipping
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/view/frontend/templates/pay_fast_checkout_fallback.phtml b/view/frontend/templates/pay_fast_checkout_fallback.phtml
new file mode 100644
index 00000000..52f0ce12
--- /dev/null
+++ b/view/frontend/templates/pay_fast_checkout_fallback.phtml
@@ -0,0 +1,28 @@
+
+
+
\ No newline at end of file
diff --git a/view/frontend/web/css/payFastCheckout.css b/view/frontend/web/css/payFastCheckout.css
index 505d05d3..781376ac 100644
--- a/view/frontend/web/css/payFastCheckout.css
+++ b/view/frontend/web/css/payFastCheckout.css
@@ -3,12 +3,7 @@
width: 100%;
}
-#paynl_fast_checkout_product {
- display: block;
- margin-bottom: 0;
- margin-right: 1%;
- width: 49%;
-}
+
#paynl_fast_checkout_cart button,
#paynl_fast_checkout_product button,
@@ -28,10 +23,6 @@
background-position: 8px center;
}
-#paynl_fast_checkout_fallback button{
- max-width: 250px;
-}
-
#top-cart-btn-fastcheckout{
margin-top: 5px;
}
@@ -47,4 +38,28 @@
background-repeat: no-repeat;
background-size: 51px;
background-position: 8px center;
+}
+
+#paynl_fast_checkout_fallback button {
+ max-width: 100%;
+}
+
+#paynl_fast_checkout_product {
+ display: block;
+ margin-bottom: 0;
+ margin-right: 1%;
+ width: 100%;
+}
+
+@media all and (min-width: 769px),print {
+ #paynl_fast_checkout_product {
+ display: block;
+ margin-bottom: 0;
+ margin-right: 1%;
+ width: 49%;
+ }
+
+ #paynl_fast_checkout_fallback button{
+ max-width: 250px;
+ }
}
\ No newline at end of file
From 2a4fbe401793c3829e6cd6f6e6949a744fd56a07 Mon Sep 17 00:00:00 2001
From: woutse
Date: Wed, 21 Aug 2024 10:03:12 +0200
Subject: [PATCH 33/47] Updated texts
---
Model/PayPaymentCreateFastCheckoutOrder.php | 2 +-
etc/adminhtml/paymentmethods/ideal.xml | 8 ++++----
i18n/de_AT.csv | 6 +++---
i18n/de_CH.csv | 6 +++---
i18n/de_DE.csv | 6 +++---
i18n/de_LU.csv | 6 +++---
i18n/en_US.csv | 10 +++++-----
i18n/fr_BE.csv | 6 +++---
i18n/fr_CA.csv | 6 +++---
i18n/fr_CH.csv | 6 +++---
i18n/fr_FR.csv | 6 +++---
i18n/fr_LU.csv | 6 +++---
i18n/nl_BE.csv | 6 +++---
i18n/nl_NL.csv | 6 +++---
14 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/PayPaymentCreateFastCheckoutOrder.php
index fbd84362..dd834bf2 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/PayPaymentCreateFastCheckoutOrder.php
@@ -214,7 +214,7 @@ public function create($params)
$order->getPayment()->setAdditionalInformation($additionalData);
$order->save();
- $order->addStatusHistoryComment(__('PAY. - Fast checkout order created'))->save();
+ $order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
return $order;
}
diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml
index 2331d1eb..de1075d4 100644
--- a/etc/adminhtml/paymentmethods/ideal.xml
+++ b/etc/adminhtml/paymentmethods/ideal.xml
@@ -155,7 +155,7 @@ This setting doesn't apply to fast checkout.
-
+
Paynl\Payment\Model\Config\Source\OffOn
@@ -211,7 +211,7 @@ This button allows users to checkout directly from the cart without the need to
1Select the fallback shipping method, which will be applied when the default shipping method could not be applied.
- In case the default shipping method could not by applied, this shiping method will be used.
+ In case the default shipping method could not by applied, this shipping method will be used.
@@ -223,10 +223,10 @@ This button allows users to checkout directly from the cart without the need to
Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.
diff --git a/i18n/de_AT.csv b/i18n/de_AT.csv
index 6876a1c6..bff29938 100644
--- a/i18n/de_AT.csv
+++ b/i18n/de_AT.csv
@@ -271,14 +271,14 @@ Mit diesem Button können Benutzer direkt vom Warenkorb aus zur Kaufabwicklung g
"Select the shipping method that should be applied first.","Wählen Sie die Versandart aus, die zuerst angewendet werden soll."
"The default shipping method will be applied to fast checkout orders.","Für Bestellungen mit fastcheckout wird die Standardversandmethode angewendet."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Wählen Sie die Fallback-Versandmethode aus, die angewendet wird, wenn die Standardversandmethode nicht angewendet werden konnte."
-"In case the default shipping method could not by applied, this shiping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
+"In case the default shipping method could not by applied, this shipping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
Hinweis anzeigen und Schnellkauf abbrechen:
Wenn diese Option ausgewählt ist, wird der Schnellkauf abgebrochen, falls die ausgewählte Versandmethode für die Bestellung nicht funktioniert. Der Kunde wird zurück zur Warenkorbseite geleitet und erhält einen Hinweis.
diff --git a/i18n/de_CH.csv b/i18n/de_CH.csv
index f833f9e5..d0cc4eee 100644
--- a/i18n/de_CH.csv
+++ b/i18n/de_CH.csv
@@ -273,14 +273,14 @@ Mit diesem Button können Benutzer direkt vom Warenkorb aus zur Kaufabwicklung g
"Select the shipping method that should be applied first.","Wählen Sie die Versandart aus, die zuerst angewendet werden soll."
"The default shipping method will be applied to fast checkout orders.","Für Bestellungen mit fastcheckout wird die Standardversandmethode angewendet."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Wählen Sie die Fallback-Versandmethode aus, die angewendet wird, wenn die Standardversandmethode nicht angewendet werden konnte."
-"In case the default shipping method could not by applied, this shiping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
+"In case the default shipping method could not by applied, this shipping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
Hinweis anzeigen und Schnellkauf abbrechen:
Wenn diese Option ausgewählt ist, wird der Schnellkauf abgebrochen, falls die ausgewählte Versandmethode für die Bestellung nicht funktioniert. Der Kunde wird zurück zur Warenkorbseite geleitet und erhält einen Hinweis.
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index f833f9e5..d0cc4eee 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -273,14 +273,14 @@ Mit diesem Button können Benutzer direkt vom Warenkorb aus zur Kaufabwicklung g
"Select the shipping method that should be applied first.","Wählen Sie die Versandart aus, die zuerst angewendet werden soll."
"The default shipping method will be applied to fast checkout orders.","Für Bestellungen mit fastcheckout wird die Standardversandmethode angewendet."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Wählen Sie die Fallback-Versandmethode aus, die angewendet wird, wenn die Standardversandmethode nicht angewendet werden konnte."
-"In case the default shipping method could not by applied, this shiping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
+"In case the default shipping method could not by applied, this shipping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
Hinweis anzeigen und Schnellkauf abbrechen:
Wenn diese Option ausgewählt ist, wird der Schnellkauf abgebrochen, falls die ausgewählte Versandmethode für die Bestellung nicht funktioniert. Der Kunde wird zurück zur Warenkorbseite geleitet und erhält einen Hinweis.
diff --git a/i18n/de_LU.csv b/i18n/de_LU.csv
index ec9fb16b..7e9c65db 100644
--- a/i18n/de_LU.csv
+++ b/i18n/de_LU.csv
@@ -274,14 +274,14 @@ Mit diesem Button können Benutzer direkt vom Warenkorb aus zur Kaufabwicklung g
"Select the shipping method that should be applied first.","Wählen Sie die Versandart aus, die zuerst angewendet werden soll."
"The default shipping method will be applied to fast checkout orders.","Für Bestellungen mit fastcheckout wird die Standardversandmethode angewendet."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Wählen Sie die Fallback-Versandmethode aus, die angewendet wird, wenn die Standardversandmethode nicht angewendet werden konnte."
-"In case the default shipping method could not by applied, this shiping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
+"In case the default shipping method could not by applied, this shipping method will be used.","Falls die Standardversandart nicht angewendet werden konnte, wird diese Versandart verwendet."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Wählen Sie aus, was passieren soll, wenn beide Versandmethoden nicht angewendet werden konnten:
Hinweis anzeigen und Schnellkauf abbrechen:
Wenn diese Option ausgewählt ist, wird der Schnellkauf abgebrochen, falls die ausgewählte Versandmethode für die Bestellung nicht funktioniert. Der Kunde wird zurück zur Warenkorbseite geleitet und erhält einen Hinweis.
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index e3710f83..40cea642 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -338,20 +338,20 @@ This button allows users to checkout directly from the cart without the need to
"Select the shipping method that should be applied first.","Select the shipping method that should be applied first."
"The default shipping method will be applied to fast checkout orders.","The default shipping method will be applied to fast checkout orders."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Select the fallback shipping method, which will be applied when the default shipping method could not be applied."
-"In case the default shipping method could not by applied, this shiping method will be used.","In case the default shipping method could not by applied, this shiping method will be used."
+"In case the default shipping method could not by applied, this shipping method will be used.","In case the default shipping method could not by applied, this shipping method will be used."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Select what should happen when both shipping methods could not be applied:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order."
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order."
"When the user selects a shipping method in the estimate on the cart page, this shipping method wil be used for fast checkout.","When the user selects a shipping method in the estimate on the cart page, this shipping method wil be used for fast checkout."
"When enabled, the fast checkout button will only be shown on the cart page for guest users.
diff --git a/i18n/fr_BE.csv b/i18n/fr_BE.csv
index 70dd1036..15e69ac2 100644
--- a/i18n/fr_BE.csv
+++ b/i18n/fr_BE.csv
@@ -275,14 +275,14 @@ Ce bouton permet aux utilisateurs de payer directement depuis le panier sans avo
"Select the shipping method that should be applied first.","Sélectionnez le mode d’expédition qui doit être appliqué en premier."
"The default shipping method will be applied to fast checkout orders.","La méthode d'expédition par défaut sera appliquée aux commandes de paiement rapide."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Sélectionnez la méthode d'expédition de secours, qui sera appliquée lorsque la méthode d'expédition par défaut ne pourra pas être appliquée."
-"In case the default shipping method could not by applied, this shiping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
+"In case the default shipping method could not by applied, this shipping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
Afficher un avis et abandonner le paiement rapide :
Lorsque cette option est sélectionnée, le paiement rapide sera abandonné si le mode d'expédition sélectionné ne fonctionne pas pour la commande, le client sera redirigé vers la page du panier et un avis s'affichera.
diff --git a/i18n/fr_CA.csv b/i18n/fr_CA.csv
index 70dd1036..15e69ac2 100644
--- a/i18n/fr_CA.csv
+++ b/i18n/fr_CA.csv
@@ -275,14 +275,14 @@ Ce bouton permet aux utilisateurs de payer directement depuis le panier sans avo
"Select the shipping method that should be applied first.","Sélectionnez le mode d’expédition qui doit être appliqué en premier."
"The default shipping method will be applied to fast checkout orders.","La méthode d'expédition par défaut sera appliquée aux commandes de paiement rapide."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Sélectionnez la méthode d'expédition de secours, qui sera appliquée lorsque la méthode d'expédition par défaut ne pourra pas être appliquée."
-"In case the default shipping method could not by applied, this shiping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
+"In case the default shipping method could not by applied, this shipping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
Afficher un avis et abandonner le paiement rapide :
Lorsque cette option est sélectionnée, le paiement rapide sera abandonné si le mode d'expédition sélectionné ne fonctionne pas pour la commande, le client sera redirigé vers la page du panier et un avis s'affichera.
diff --git a/i18n/fr_CH.csv b/i18n/fr_CH.csv
index 70dd1036..15e69ac2 100644
--- a/i18n/fr_CH.csv
+++ b/i18n/fr_CH.csv
@@ -275,14 +275,14 @@ Ce bouton permet aux utilisateurs de payer directement depuis le panier sans avo
"Select the shipping method that should be applied first.","Sélectionnez le mode d’expédition qui doit être appliqué en premier."
"The default shipping method will be applied to fast checkout orders.","La méthode d'expédition par défaut sera appliquée aux commandes de paiement rapide."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Sélectionnez la méthode d'expédition de secours, qui sera appliquée lorsque la méthode d'expédition par défaut ne pourra pas être appliquée."
-"In case the default shipping method could not by applied, this shiping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
+"In case the default shipping method could not by applied, this shipping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
Afficher un avis et abandonner le paiement rapide :
Lorsque cette option est sélectionnée, le paiement rapide sera abandonné si le mode d'expédition sélectionné ne fonctionne pas pour la commande, le client sera redirigé vers la page du panier et un avis s'affichera.
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index 395ab85a..55906c96 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -275,14 +275,14 @@ Ce bouton permet aux utilisateurs de payer directement depuis le panier sans avo
"Select the shipping method that should be applied first.","Sélectionnez le mode d’expédition qui doit être appliqué en premier."
"The default shipping method will be applied to fast checkout orders.","La méthode d'expédition par défaut sera appliquée aux commandes de paiement rapide."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Sélectionnez la méthode d'expédition de secours, qui sera appliquée lorsque la méthode d'expédition par défaut ne pourra pas être appliquée."
-"In case the default shipping method could not by applied, this shiping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
+"In case the default shipping method could not by applied, this shipping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
Afficher un avis et abandonner le paiement rapide :
Lorsque cette option est sélectionnée, le paiement rapide sera abandonné si le mode d'expédition sélectionné ne fonctionne pas pour la commande, le client sera redirigé vers la page du panier et un avis s'affichera.
diff --git a/i18n/fr_LU.csv b/i18n/fr_LU.csv
index dfa7189c..0d9c8272 100644
--- a/i18n/fr_LU.csv
+++ b/i18n/fr_LU.csv
@@ -274,14 +274,14 @@ Ce bouton permet aux utilisateurs de payer directement depuis le panier sans avo
"Select the shipping method that should be applied first.","Sélectionnez le mode d’expédition qui doit être appliqué en premier."
"The default shipping method will be applied to fast checkout orders.","La méthode d'expédition par défaut sera appliquée aux commandes de paiement rapide."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Sélectionnez la méthode d'expédition de secours, qui sera appliquée lorsque la méthode d'expédition par défaut ne pourra pas être appliquée."
-"In case the default shipping method could not by applied, this shiping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
+"In case the default shipping method could not by applied, this shipping method will be used.","Dans le cas où le mode d'expédition par défaut ne pourrait pas être appliqué, ce mode d'expédition sera utilisé."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Sélectionnez ce qui doit se produire lorsque les deux méthodes d'expédition ne peuvent pas être appliquées :
Afficher un avis et abandonner le paiement rapide :
Lorsque cette option est sélectionnée, le paiement rapide sera abandonné si le mode d'expédition sélectionné ne fonctionne pas pour la commande, le client sera redirigé vers la page du panier et un avis s'affichera.
diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv
index 35faca04..f9bbbff6 100644
--- a/i18n/nl_BE.csv
+++ b/i18n/nl_BE.csv
@@ -332,14 +332,14 @@ Met deze knop kunnen gebruikers direct afrekenen vanuit de productpagina zonder
"Select the shipping method that should be applied first.","Selecteer de verzendmethode die als eerste moet worden toegepast."
"The default shipping method will be applied to fast checkout orders.","Voor bestellingen met snel bestellen wordt de standaardverzendmethode toegepast."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Selecteer de alternatieve verzendmethode die wordt toegepast als de standaardverzendmethode niet kan worden toegepast."
-"In case the default shipping method could not by applied, this shiping method will be used.","Indien de standaard verzendmethode niet kan worden toegepast, wordt deze verzendmethode gebruikt."
+"In case the default shipping method could not by applied, this shipping method will be used.","Indien de standaard verzendmethode niet kan worden toegepast, wordt deze verzendmethode gebruikt."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Selecteer wat er moet gebeuren als beide verzendmethoden niet kunnen worden toegepast:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Selecteer wat er moet gebeuren als beide verzendmethoden niet kunnen worden toegepast:
Melding weergeven en snel bestellen afbreken:
Wanneer deze optie is geselecteerd, wordt het snel bestellen afgebroken als de geselecteerde verzendmethode niet werkt voor de bestelling. De klant wordt teruggeleid naar de winkelwagenpagina en krijgt een melding te zien.
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index 50eed47e..4a2b2485 100644
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -324,14 +324,14 @@ Met deze knop kunnen gebruikers direct afrekenen vanuit de productpagina zonder
"Select the shipping method that should be applied first.","Selecteer de verzendmethode die als eerste moet worden toegepast."
"The default shipping method will be applied to fast checkout orders.","Voor bestellingen met snel bestellen wordt de standaardverzendmethode toegepast."
"Select the fallback shipping method, which will be applied when the default shipping method could not be applied.","Selecteer de alternatieve verzendmethode die wordt toegepast als de standaardverzendmethode niet kan worden toegepast."
-"In case the default shipping method could not by applied, this shiping method will be used.","Indien de standaard verzendmethode niet kan worden toegepast, wordt deze verzendmethode gebruikt."
+"In case the default shipping method could not by applied, this shipping method will be used.","Indien de standaard verzendmethode niet kan worden toegepast, wordt deze verzendmethode gebruikt."
"Select what should happen when both shipping methods could not be applied:
Show notice and abort fast checkout:
-When This option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
+When this option is selected the fast checkout will be aborted in case the selected shipping method does not work for the order, the customer is redirected back to the cart page and shown a notice.
Show intermediate screen to select shipping method:
-Using the intermediate screen will allow uses to select their own shipping method in case the selected shipping method does not work for the order.","Selecteer wat er moet gebeuren als beide verzendmethoden niet kunnen worden toegepast:
+Using the intermediate screen will allow users to select their own shipping method in case the selected shipping method does not work for the order.","Selecteer wat er moet gebeuren als beide verzendmethoden niet kunnen worden toegepast:
Melding weergeven en snel bestellen afbreken:
Wanneer deze optie is geselecteerd, wordt het snel bestellen afgebroken als de geselecteerde verzendmethode niet werkt voor de bestelling. De klant wordt teruggeleid naar de winkelwagenpagina en krijgt een melding te zien.
From e14def34f21bfba1baaeb394c764cc7b01821414 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Wed, 21 Aug 2024 10:56:08 +0200
Subject: [PATCH 34/47] Fix translations
---
.../Source/FastCheckoutFallbackOptions.php | 2 +-
i18n/de_AT.csv | 14 +++++++----
i18n/de_CH.csv | 12 ++++++----
i18n/de_DE.csv | 12 ++++++----
i18n/de_LU.csv | 12 ++++++----
i18n/en_US.csv | 24 +++++++++++--------
i18n/fr_BE.csv | 14 +++++++----
i18n/fr_CA.csv | 14 +++++++----
i18n/fr_CH.csv | 14 +++++++----
i18n/fr_FR.csv | 14 +++++++----
i18n/fr_LU.csv | 14 +++++++----
i18n/nl_BE.csv | 20 +++++++++-------
i18n/nl_NL.csv | 18 ++++++++------
13 files changed, 116 insertions(+), 68 deletions(-)
diff --git a/Model/Config/Source/FastCheckoutFallbackOptions.php b/Model/Config/Source/FastCheckoutFallbackOptions.php
index 5ca48694..a78c051c 100644
--- a/Model/Config/Source/FastCheckoutFallbackOptions.php
+++ b/Model/Config/Source/FastCheckoutFallbackOptions.php
@@ -30,7 +30,7 @@ public function toOptionArray()
public function toArray()
{
return [
- 0 => __('Show notice and abort fastcheckout'),
+ 0 => __('Show notice and abort fast checkout'),
1 => __('Show intermediate screen to select shipping method')
];
}
diff --git a/i18n/de_AT.csv b/i18n/de_AT.csv
index bff29938..7e0d99d4 100644
--- a/i18n/de_AT.csv
+++ b/i18n/de_AT.csv
@@ -224,16 +224,16 @@ Stellen Sie diese Auswahl an der Kasse bereit: Der Kunde kann an der Kasse zwisc
"Refund amount must be greater than 0.00","Der Betrag muss größer als 0,00 sein"
"Refund amount must not exceed ","Der Betrag darf nicht höher sein als "
"Select a terminal","Wählen Sie ein Terminal aus"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
+This setting doesn't apply to fast checkout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
Privat, B2C: Diese Zahlungsmethode nur anzeigen, wenn der Kunde keinen Firmennamen eingegeben hat.
@@ -293,4 +293,8 @@ This setting does not effect the product page. If fast checkout is enabled for t
Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle Checkout für die Produktseite aktiviert ist, wird die Schaltfläche für den fastcheckout immer angezeigt.."
"Show the fast checkout button on the cart page, only for guest customers.","Zeigen Sie die Schaltfläche fastcheckout auf der Warenkorbseite nur für Gastkunden an."
"When updating this setting, please flush Magento's cache afterwards ","Wenn Sie diese Einstellung aktualisieren, leeren Sie bitte anschließend den Magento-Cache "
-"Continue","Weitermachen"
\ No newline at end of file
+"Continue","Weitermachen"
+"On - as Optional","Ein - als Optional"
+"On - as Required","Ein - nach Bedarf"
+"Show notice and abort fast checkout","Hinweis anzeigen und Schnellkasse abbrechen"
+"Show intermediate screen to select shipping method","Zwischenbildschirm zur Auswahl der Versandart anzeigen"
\ No newline at end of file
diff --git a/i18n/de_CH.csv b/i18n/de_CH.csv
index d0cc4eee..1215d786 100644
--- a/i18n/de_CH.csv
+++ b/i18n/de_CH.csv
@@ -226,16 +226,16 @@ Stellen Sie diese Auswahl an der Kasse bereit: Der Kunde kann an der Kasse zwisc
"Refund amount must be greater than 0.00","Der Betrag muss größer als 0,00 sein"
"Refund amount must not exceed ","Der Betrag darf nicht höher sein als "
"Select a terminal","Wählen Sie ein Terminal aus"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
+This setting doesn't apply to fast checkout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
Privat, B2C: Diese Zahlungsmethode nur anzeigen, wenn der Kunde keinen Firmennamen eingegeben hat.
@@ -296,3 +296,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
"Show the fast checkout button on the cart page, only for guest customers.","Zeigen Sie die Schaltfläche fastcheckout auf der Warenkorbseite nur für Gastkunden an."
"When updating this setting, please flush Magento's cache afterwards ","Wenn Sie diese Einstellung aktualisieren, leeren Sie bitte anschließend den Magento-Cache "
"Continue","Weitermachen"
+"On - as Optional","Ein - als Optional"
+"On - as Required","Ein - nach Bedarf"
+"Show notice and abort fast checkout","Hinweis anzeigen und Schnellkasse abbrechen"
+"Show intermediate screen to select shipping method","Zwischenbildschirm zur Auswahl der Versandart anzeigen"
\ No newline at end of file
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index d0cc4eee..1215d786 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -226,16 +226,16 @@ Stellen Sie diese Auswahl an der Kasse bereit: Der Kunde kann an der Kasse zwisc
"Refund amount must be greater than 0.00","Der Betrag muss größer als 0,00 sein"
"Refund amount must not exceed ","Der Betrag darf nicht höher sein als "
"Select a terminal","Wählen Sie ein Terminal aus"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
+This setting doesn't apply to fast checkout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
Privat, B2C: Diese Zahlungsmethode nur anzeigen, wenn der Kunde keinen Firmennamen eingegeben hat.
@@ -296,3 +296,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
"Show the fast checkout button on the cart page, only for guest customers.","Zeigen Sie die Schaltfläche fastcheckout auf der Warenkorbseite nur für Gastkunden an."
"When updating this setting, please flush Magento's cache afterwards ","Wenn Sie diese Einstellung aktualisieren, leeren Sie bitte anschließend den Magento-Cache "
"Continue","Weitermachen"
+"On - as Optional","Ein - als Optional"
+"On - as Required","Ein - nach Bedarf"
+"Show notice and abort fast checkout","Hinweis anzeigen und Schnellkasse abbrechen"
+"Show intermediate screen to select shipping method","Zwischenbildschirm zur Auswahl der Versandart anzeigen"
\ No newline at end of file
diff --git a/i18n/de_LU.csv b/i18n/de_LU.csv
index 7e9c65db..32729789 100644
--- a/i18n/de_LU.csv
+++ b/i18n/de_LU.csv
@@ -227,16 +227,16 @@ Stellen Sie diese Auswahl an der Kasse bereit: Der Kunde kann an der Kasse zwisc
"Refund amount must be greater than 0.00","Der Betrag muss größer als 0,00 sein"
"Refund amount must not exceed ","Der Betrag darf nicht höher sein als "
"Select a terminal","Wählen Sie ein Terminal aus"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Legen Sie fest, in welchem Land iDEAL verfügbar sein soll. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Legen Sie den Mindestbestellwert fest, damit iDEAL verfügbar ist. Lassen Sie das Feld leer, wenn Sie keinen Mindestwert festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Legen Sie den maximalen Bestellbetrag fest, der für iDEAL verfügbar sein soll. Lassen Sie das Feld leer, wenn Sie keinen Höchstbetrag festlegen möchten. Diese Einstellung gilt nicht für Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
+This setting doesn't apply to fast checkout.","Standardmäßig sind Zahlungsmethoden für alle Kundentypen verfügbar. Um dies auf einen Kundentyp zu beschränken, verwenden Sie eine der folgenden Optionen:
Privat, B2C: Diese Zahlungsmethode nur anzeigen, wenn der Kunde keinen Firmennamen eingegeben hat.
@@ -297,3 +297,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
"Show the fast checkout button on the cart page, only for guest customers.","Zeigen Sie die Schaltfläche fastcheckout auf der Warenkorbseite nur für Gastkunden an."
"When updating this setting, please flush Magento's cache afterwards ","Wenn Sie diese Einstellung aktualisieren, leeren Sie bitte anschließend den Magento-Cache "
"Continue","Weitermachen"
+"On - as Optional","Ein - als Optional"
+"On - as Required","Ein - nach Bedarf"
+"Show notice and abort fast checkout","Hinweis anzeigen und Schnellkasse abbrechen"
+"Show intermediate screen to select shipping method","Zwischenbildschirm zur Auswahl der Versandart anzeigen"
\ No newline at end of file
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index 40cea642..d302bd91 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -272,44 +272,44 @@ Provide this choice in the checkout: the customer can choose in the checkout bet
Direct checkout payment: pin transaction will be started right when the instore is selected in the checkout.
Payment takes place at the pickup location: the order is created in the Magento admin, the pin transaction can be started from there when the customer comes to pick up the order.
Provide this choice in the checkout: the customer can choose in the checkout between the options given above."
-"Doesn't apply to fastcheckout.","Doesn't apply to fastcheckout."
+"doesn't apply to fast checkout.","doesn't apply to fast checkout."
"By default payment methods are available in the checkout for all customer types.
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-Doesn't apply to fastcheckout.","Standaard zijn betaalmethoden beschikbaar in de checkout voor alle klanttypen.
+doesn't apply to fast checkout.","Standaard zijn betaalmethoden beschikbaar in de checkout voor alle klanttypen.
Particulier, B2C: Laat deze betaalmethode alleen zien als de klant geen bedrijfsnaam heeft ingevoerd.
Zakelijk, BB2: Laat deze betaalmethode alleen zien als de klant een bedrijfsnaam heeft opgegeven.
-Doesn't apply to fastcheckout."
+doesn't apply to fast checkout."
"Pay. Refund by card","Pay. Refund by card"
"Amount","Amount"
"Terminal","Terminal"
"Refund amount must be greater than 0.00","Refund amount must be greater than 0.00"
"Refund amount must not exceed ","Refund amount must not exceed "
"Select a terminal","Select a terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
+This setting doesn't apply to fast checkout.","By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout."
+This setting doesn't apply to fast checkout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
+This setting doesn't apply to fast checkout.","Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout."
+This setting doesn't apply to fast checkout."
"Fast Checkout","Fast Checkout"
"iDEAL Fast Checkout","iDEAL Fast Checkout"
"Cart page","Cart page"
@@ -361,3 +361,7 @@ This setting does not effect the product page. If fast checkout is enabled for t
"Show the fast checkout button on the cart page, only for guest customers.","Show the fast checkout button on the cart page, only for guest customers."
"When updating this setting, please flush Magento's cache afterwards ","When updating this setting, please flush Magento's cache afterwards "
"Continue","Continue"
+"On - as Optional","On - as Optional"
+"On - as Required","On - as Required"
+"Show notice and abort fast checkout","Show notice and abort fast checkout"
+"Show intermediate screen to select shipping method","Show intermediate screen to select shipping method"
\ No newline at end of file
diff --git a/i18n/fr_BE.csv b/i18n/fr_BE.csv
index 15e69ac2..579f16d9 100644
--- a/i18n/fr_BE.csv
+++ b/i18n/fr_BE.csv
@@ -226,16 +226,16 @@ Proposer ce choix lors du paiement : le client peut choisir lors du paiement ent
"Refund amount must be greater than 0.00","Le montant doit être supérieur à 0,00"
"Refund amount must not exceed ","Le montant ne peut excéder "
"Select a terminal","Sélectionnez un terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
+This setting doesn't apply to fast checkout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
Privé, B2C: affichez ce mode de paiement uniquement lorsque le client n'a pas saisi de nom d'entreprise.
@@ -244,7 +244,7 @@ Entreprise, BB2: affichez ce mode de paiement uniquement lorsque le client a sai
Ce paramètre ne s'applique pas à Fastcheckout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
+This setting doesn't apply to fast checkout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
Ce paramètre ne s'applique pas à Fastcheckout."
"Fast Checkout","Fastcheckout"
@@ -298,3 +298,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
"Show the fast checkout button on the cart page, only for guest customers.","Afficher le bouton de paiement rapide sur la page du panier, uniquement pour les clients invités."
"When updating this setting, please flush Magento's cache afterwards ","Lors de la mise à jour de ce paramètre, veuillez ensuite vider le cache de Magento "
"Continue","Continuer"
+"On - as Optional","Activé - en option"
+"On - as Required","Activé - en requis"
+"Show notice and abort fast checkout","Afficher un avis et abandonner le fastcheckout"
+"Show intermediate screen to select shipping method","Afficher l'écran intermédiaire pour sélectionner la méthode d'expédition"
\ No newline at end of file
diff --git a/i18n/fr_CA.csv b/i18n/fr_CA.csv
index 15e69ac2..579f16d9 100644
--- a/i18n/fr_CA.csv
+++ b/i18n/fr_CA.csv
@@ -226,16 +226,16 @@ Proposer ce choix lors du paiement : le client peut choisir lors du paiement ent
"Refund amount must be greater than 0.00","Le montant doit être supérieur à 0,00"
"Refund amount must not exceed ","Le montant ne peut excéder "
"Select a terminal","Sélectionnez un terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
+This setting doesn't apply to fast checkout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
Privé, B2C: affichez ce mode de paiement uniquement lorsque le client n'a pas saisi de nom d'entreprise.
@@ -244,7 +244,7 @@ Entreprise, BB2: affichez ce mode de paiement uniquement lorsque le client a sai
Ce paramètre ne s'applique pas à Fastcheckout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
+This setting doesn't apply to fast checkout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
Ce paramètre ne s'applique pas à Fastcheckout."
"Fast Checkout","Fastcheckout"
@@ -298,3 +298,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
"Show the fast checkout button on the cart page, only for guest customers.","Afficher le bouton de paiement rapide sur la page du panier, uniquement pour les clients invités."
"When updating this setting, please flush Magento's cache afterwards ","Lors de la mise à jour de ce paramètre, veuillez ensuite vider le cache de Magento "
"Continue","Continuer"
+"On - as Optional","Activé - en option"
+"On - as Required","Activé - en requis"
+"Show notice and abort fast checkout","Afficher un avis et abandonner le fastcheckout"
+"Show intermediate screen to select shipping method","Afficher l'écran intermédiaire pour sélectionner la méthode d'expédition"
\ No newline at end of file
diff --git a/i18n/fr_CH.csv b/i18n/fr_CH.csv
index 15e69ac2..579f16d9 100644
--- a/i18n/fr_CH.csv
+++ b/i18n/fr_CH.csv
@@ -226,16 +226,16 @@ Proposer ce choix lors du paiement : le client peut choisir lors du paiement ent
"Refund amount must be greater than 0.00","Le montant doit être supérieur à 0,00"
"Refund amount must not exceed ","Le montant ne peut excéder "
"Select a terminal","Sélectionnez un terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
+This setting doesn't apply to fast checkout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
Privé, B2C: affichez ce mode de paiement uniquement lorsque le client n'a pas saisi de nom d'entreprise.
@@ -244,7 +244,7 @@ Entreprise, BB2: affichez ce mode de paiement uniquement lorsque le client a sai
Ce paramètre ne s'applique pas à Fastcheckout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
+This setting doesn't apply to fast checkout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
Ce paramètre ne s'applique pas à Fastcheckout."
"Fast Checkout","Fastcheckout"
@@ -298,3 +298,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
"Show the fast checkout button on the cart page, only for guest customers.","Afficher le bouton de paiement rapide sur la page du panier, uniquement pour les clients invités."
"When updating this setting, please flush Magento's cache afterwards ","Lors de la mise à jour de ce paramètre, veuillez ensuite vider le cache de Magento "
"Continue","Continuer"
+"On - as Optional","Activé - en option"
+"On - as Required","Activé - en requis"
+"Show notice and abort fast checkout","Afficher un avis et abandonner le fastcheckout"
+"Show intermediate screen to select shipping method","Afficher l'écran intermédiaire pour sélectionner la méthode d'expédition"
\ No newline at end of file
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index 55906c96..c889b953 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -226,16 +226,16 @@ Proposer ce choix lors du paiement : le client peut choisir lors du paiement ent
"Refund amount must be greater than 0.00","Le montant doit être supérieur à 0,00"
"Refund amount must not exceed ","Le montant ne peut excéder "
"Select a terminal","Sélectionnez un terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
+This setting doesn't apply to fast checkout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
Privé, B2C: affichez ce mode de paiement uniquement lorsque le client n'a pas saisi de nom d'entreprise.
@@ -244,7 +244,7 @@ Entreprise, BB2: affichez ce mode de paiement uniquement lorsque le client a sai
Ce paramètre ne s'applique pas à Fastcheckout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
+This setting doesn't apply to fast checkout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
Ce paramètre ne s'applique pas à Fastcheckout."
"Fast Checkout","Fastcheckout"
@@ -298,3 +298,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
"Show the fast checkout button on the cart page, only for guest customers.","Afficher le bouton de paiement rapide sur la page du panier, uniquement pour les clients invités."
"When updating this setting, please flush Magento's cache afterwards ","Lors de la mise à jour de ce paramètre, veuillez ensuite vider le cache de Magento "
"Continue","Continuer"
+"On - as Optional","Activé - en option"
+"On - as Required","Activé - en requis"
+"Show notice and abort fast checkout","Afficher un avis et abandonner le fastcheckout"
+"Show intermediate screen to select shipping method","Afficher l'écran intermédiaire pour sélectionner la méthode d'expédition"
\ No newline at end of file
diff --git a/i18n/fr_LU.csv b/i18n/fr_LU.csv
index 0d9c8272..22728e3a 100644
--- a/i18n/fr_LU.csv
+++ b/i18n/fr_LU.csv
@@ -225,16 +225,16 @@ Proposer ce choix lors du paiement : le client peut choisir lors du paiement ent
"Refund amount must be greater than 0.00","Le montant doit être supérieur à 0,00"
"Refund amount must not exceed ","Le montant ne peut excéder "
"Select a terminal","Sélectionnez un terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Déterminez dans quel pays iDEAL doit être disponible. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Définissez le montant minimum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant minimum. Ce paramètre ne s'applique pas à Fastcheckout."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Définissez le montant maximum de commande pour que iDEAL soit disponible. Laissez ce champ vide si vous ne souhaitez pas définir de montant maximum. Ce paramètre ne s'applique pas à Fastcheckout."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
+This setting doesn't apply to fast checkout.","Par défaut, les modes de paiement sont disponibles pour tous les types de clients. Pour limiter cette option à un type de client, utilisez l'une des options suivantes:
Privé, B2C: affichez ce mode de paiement uniquement lorsque le client n'a pas saisi de nom d'entreprise.
@@ -243,7 +243,7 @@ Entreprise, BB2: affichez ce mode de paiement uniquement lorsque le client a sai
Ce paramètre ne s'applique pas à Fastcheckout."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
+This setting doesn't apply to fast checkout.","Sélectionnez le groupe de clients auquel iDEAL est disponible. Les groupes de clients sont définis dans Magento (Menu: Clients->Groupes de clients).
Ce paramètre ne s'applique pas à Fastcheckout."
"Fast Checkout","Fastcheckout"
@@ -297,3 +297,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
"Show the fast checkout button on the cart page, only for guest customers.","Afficher le bouton de paiement rapide sur la page du panier, uniquement pour les clients invités."
"When updating this setting, please flush Magento's cache afterwards ","Lors de la mise à jour de ce paramètre, veuillez ensuite vider le cache de Magento "
"Continue","Continuer"
+"On - as Optional","Activé - en option"
+"On - as Required","Activé - en requis"
+"Show notice and abort fast checkout","Afficher un avis et abandonner le fastcheckout"
+"Show intermediate screen to select shipping method","Afficher l'écran intermédiaire pour sélectionner la méthode d'expédition"
\ No newline at end of file
diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv
index f9bbbff6..731fe6b9 100644
--- a/i18n/nl_BE.csv
+++ b/i18n/nl_BE.csv
@@ -276,34 +276,34 @@ Provide this choice in the checkout: the customer can choose in the checkout bet
Directe betaling: de pintransactie wordt gestart zodra instore is geselecteerd bij het afrekenen.
Betaling vindt plaats op de afhaallocatie: de bestelling wordt aangemaakt in de Magento admin, van daaruit kan de pintransactie gestart worden als de klant de bestelling komt ophalen.
Geef deze keuze op bij het afrekenen: de klant kan bij het afrekenen kiezen tussen bovenstaande opties."
-"Doesn't apply to fastcheckout.","Geldt niet voor fastcheckout."
+"doesn't apply to fast checkout.","Geldt niet voor snel bestellen."
"Pay. Refund by card","Pay. Retourpin"
"Amount","Bedrag"
"Terminal","Terminal"
"Refund amount must be greater than 0.00","Het bedrag moet groter zijn dan 0,00"
"Refund amount must not exceed ","Het bedrag mag niet hoger zijn dan "
"Select a terminal","Selecteer een terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Bepaal in welk land iDEAL beschikbaar moet zijn. Deze instelling is niet van toepassing op Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Stel het minimale bestelbedrag in voor iDEAL. Laat leeg als u geen minimumbedrag wilt instellen. Deze instelling is niet van toepassing op Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Stel het maximale orderbedrag in voor iDEAL dat beschikbaar moet zijn. Laat dit leeg als u geen maximumbedrag wilt instellen. Deze instelling is niet van toepassing op Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Bepaal in welk land iDEAL beschikbaar moet zijn. Deze instelling is niet van toepassing op snel bestellen."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Stel het minimale bestelbedrag in voor iDEAL. Laat leeg als u geen minimumbedrag wilt instellen. Deze instelling is niet van toepassing op snel bestellen."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Stel het maximale orderbedrag in voor iDEAL dat beschikbaar moet zijn. Laat dit leeg als u geen maximumbedrag wilt instellen. Deze instelling is niet van toepassing op snel bestellen."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standaard zijn betaalmethoden beschikbaar voor alle klanttypen. Om dit te beperken tot een klanttype, gebruikt u een van de volgende opties:
+This setting doesn't apply to fast checkout.","Standaard zijn betaalmethoden beschikbaar voor alle klanttypen. Om dit te beperken tot een klanttype, gebruikt u een van de volgende opties:
Privé, B2C: Toon deze betaalmethode alleen als de klant geen bedrijfsnaam heeft ingevoerd.
Zakelijk, BB2: Toon deze betaalmethode alleen als de klant een bedrijfsnaam heeft ingevoerd.
-Deze instelling is niet van toepassing op Fastcheckout."
+Deze instelling is niet van toepassing op snel bestellen."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Selecteer voor welke klantgroep iDEAL beschikbaar is. Klantgroepen worden gedefinieerd in Magento (Menu: Customers->Customer Groups).
+This setting doesn't apply to fast checkout.","Selecteer voor welke klantgroep iDEAL beschikbaar is. Klantgroepen worden gedefinieerd in Magento (Menu: Customers->Customer Groups).
-Deze instelling is niet van toepassing op Fastcheckout."
+Deze instelling is niet van toepassing op snel bestellen."
"Fast Checkout","Snel bestellen"
"iDEAL Fast Checkout","iDEAL Snel bestellen"
"Cart page","Winkelwagenpagina"
@@ -355,3 +355,7 @@ Deze instelling heeft geen effect op de productpagina. Als snel bestellen is ing
"Show the fast checkout button on the cart page, only for guest customers.","Toon de knop voor snel bestellen op de winkelwagenpagina, alleen voor gastklanten."
"When updating this setting, please flush Magento's cache afterwards ","Wanneer u deze instelling bijwerkt, moet u de cache van Magento daarna leegmaken "
"Continue","Verder"
+"On - as Optional","Aan - als Optioneel"
+"On - as Required","Aan - als Verplicht"
+"Show notice and abort fast checkout","Toon melding en annuleer snel bestellen"
+"Show intermediate screen to select shipping method","Toon tussenscherm om verzendmethode te selecteren"
\ No newline at end of file
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index 4a2b2485..c474b6c3 100644
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -275,27 +275,27 @@ Geef deze keuze op bij het afrekenen: de klant kan bij het afrekenen kiezen tuss
"Refund amount must be greater than 0.00","Het bedrag moet groter zijn dan 0,00"
"Refund amount must not exceed ","Het bedrag mag niet hoger zijn dan "
"Select a terminal","Selecteer een terminal"
-"Determine in which country iDEAL should be available. This setting doesn't apply to Fastcheckout.","Bepaal in welk land iDEAL beschikbaar moet zijn. Deze instelling is niet van toepassing op Fastcheckout."
-"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to Fastcheckout.","Stel het minimale bestelbedrag in voor iDEAL. Laat leeg als u geen minimumbedrag wilt instellen. Deze instelling is niet van toepassing op Fastcheckout."
-"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to Fastcheckout.","Stel het maximale orderbedrag in voor iDEAL dat beschikbaar moet zijn. Laat dit leeg als u geen maximumbedrag wilt instellen. Deze instelling is niet van toepassing op Fastcheckout."
+"Determine in which country iDEAL should be available. This setting doesn't apply to fast checkout.","Bepaal in welk land iDEAL beschikbaar moet zijn. Deze instelling is niet van toepassing op snel bestellen."
+"Set the minimum order amount for iDEAL to be available. Leave blank if you don't want to set a minimum amount. This setting doesn't apply to fast checkout.","Stel het minimale bestelbedrag in voor iDEAL. Laat leeg als u geen minimumbedrag wilt instellen. Deze instelling is niet van toepassing op snel bestellen."
+"Set the maximum order amount for iDEAL to be available. Leave blank if you don't want to set a maximum amount. This setting doesn't apply to fast checkout.","Stel het maximale orderbedrag in voor iDEAL dat beschikbaar moet zijn. Laat dit leeg als u geen maximumbedrag wilt instellen. Deze instelling is niet van toepassing op snel bestellen."
"By default payment methods are available for all customer types. To limit this to a customer type, use one of the following options:
Private, B2C: Only show this payment method when the customer didn't enter a company name.
Business, BB2: Only show this payment method when the customer entered a company name.
-This setting doesn't apply to Fastcheckout.","Standaard zijn betaalmethoden beschikbaar voor alle klanttypen. Om dit te beperken tot een klanttype, gebruikt u een van de volgende opties:
+This setting doesn't apply to fast checkout.","Standaard zijn betaalmethoden beschikbaar voor alle klanttypen. Om dit te beperken tot een klanttype, gebruikt u een van de volgende opties:
Privé, B2C: Toon deze betaalmethode alleen als de klant geen bedrijfsnaam heeft ingevoerd.
Zakelijk, BB2: Toon deze betaalmethode alleen als de klant een bedrijfsnaam heeft ingevoerd.
-Deze instelling is niet van toepassing op Fastcheckout."
+Deze instelling is niet van toepassing op snel bestellen."
"Select to which customer group iDEAL is available. Customer groups are defined in Magento (Menu: Customers->Customer Groups).
-This setting doesn't apply to Fastcheckout.","Selecteer voor welke klantgroep iDEAL beschikbaar is. Klantgroepen worden gedefinieerd in Magento (Menu: Customers->Customer Groups).
+This setting doesn't apply to fast checkout.","Selecteer voor welke klantgroep iDEAL beschikbaar is. Klantgroepen worden gedefinieerd in Magento (Menu: Customers->Customer Groups).
-Deze instelling is niet van toepassing op Fastcheckout."
+Deze instelling is niet van toepassing op snel bestellen."
"Fast Checkout","Snel bestellen"
"iDEAL Fast Checkout","iDEAL Snel bestellen"
"Cart page","Winkelwagenpagina"
@@ -347,3 +347,7 @@ Deze instelling heeft geen effect op de productpagina. Als snel bestellen is ing
"Show the fast checkout button on the cart page, only for guest customers.","Toon de knop voor snel bestellen op de winkelwagenpagina, alleen voor gastklanten."
"When updating this setting, please flush Magento's cache afterwards ","Wanneer u deze instelling bijwerkt, moet u de cache van Magento daarna leegmaken "
"Continue","Verder"
+"On - as Optional","Aan - als Optioneel"
+"On - as Required","Aan - als Verplicht"
+"Show notice and abort fast checkout","Toon melding en annuleer snel bestellen"
+"Show intermediate screen to select shipping method","Toon tussenscherm om verzendmethode te selecteren"
\ No newline at end of file
From 6f76d71d1a2e261e7f291055f289118ddfd4e6b9 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Thu, 22 Aug 2024 14:21:52 +0200
Subject: [PATCH 35/47] Fix error after timeout
---
Controller/Checkout/Exchange.php | 29 +++++++++++++++++--
Controller/Checkout/FastCheckoutStart.php | 4 +--
Model/Config/Source/ActiveShippingMethods.php | 2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index d0796080..41c49360 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -2,8 +2,10 @@
namespace Paynl\Payment\Controller\Checkout;
+use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\OrderRepository;
use Paynl\Payment\Controller\CsrfAwareActionInterface;
@@ -46,6 +48,16 @@ class Exchange extends PayAction implements CsrfAwareActionInterface
*/
private $payHelper;
+ /**
+ * @var OrderRepositoryInterface
+ */
+ private $orderRepositoryInterface;
+
+ /**
+ * @var SearchCriteriaBuilder
+ */
+ private $searchCriteriaBuilder;
+
/**
* @var
*/
@@ -78,6 +90,8 @@ public function validateForCsrf(RequestInterface $request): bool
* @param PayPayment $payPayment
* @param PayPaymentCreateFastCheckoutOrder $payPaymentCreateFastCheckoutOrder
* @param PayHelper $payHelper
+ * @param OrderRepositoryInterface $orderRepositoryInterface
+ * @param SearchCriteriaBuilder $searchCriteriaBuilder
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
@@ -86,7 +100,9 @@ public function __construct(
OrderRepository $orderRepository,
PayPayment $payPayment,
PayPaymentCreateFastCheckoutOrder $payPaymentCreateFastCheckoutOrder,
- PayHelper $payHelper
+ PayHelper $payHelper,
+ OrderRepositoryInterface $orderRepositoryInterface,
+ SearchCriteriaBuilder $searchCriteriaBuilder
) {
$this->result = $result;
$this->config = $config;
@@ -94,6 +110,8 @@ public function __construct(
$this->payPayment = $payPayment;
$this->payPaymentCreateFastCheckoutOrder = $payPaymentCreateFastCheckoutOrder;
$this->payHelper = $payHelper;
+ $this->orderRepositoryInterface = $orderRepositoryInterface;
+ $this->searchCriteriaBuilder = $searchCriteriaBuilder;
parent::__construct($context);
}
@@ -200,7 +218,14 @@ public function execute()
if ($this->isFastCheckout($params)) {
try {
- $order = $this->payPaymentCreateFastCheckoutOrder->create($params);
+ $orderId = explode('fastcheckout', $params['orderId']);
+ $quoteId = $orderId[1];
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
+ $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
+ $order = array_shift($searchResult) ?? null;
+ if (empty($order)) {
+ $order = $this->payPaymentCreateFastCheckoutOrder->create($params);
+ }
} catch (\Exception $e) {
$this->payHelper->logCritical($e, $params);
return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
diff --git a/Controller/Checkout/FastCheckoutStart.php b/Controller/Checkout/FastCheckoutStart.php
index 3ce2159b..014ba40b 100644
--- a/Controller/Checkout/FastCheckoutStart.php
+++ b/Controller/Checkout/FastCheckoutStart.php
@@ -121,7 +121,7 @@ private function quoteSetDummyData($quote, $params)
$shippingMethodsAvaileble = [];
foreach ($shippingData as $shipping) {
$code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
- if ($code != 'instore_pickup') {
+ if ($code != 'instore_pickup' && $code != 'instore_instore') {
$shippingMethodsAvaileble[$code] = $code;
}
}
@@ -199,7 +199,7 @@ public function cacheShippingMethods()
$currency = $this->storeManager->getStore()->getCurrentCurrency();
$shippingRates = [];
foreach ($rates as $rate) {
- if (strpos($rate->getCode(), 'error') === false && $rate->getCode() != 'instore_pickup') {
+ if (strpos($rate->getCode(), 'error') === false && $rate->getCode() != 'instore_pickup' && $rate->getCode() != 'instore_instore') {
$shippingRates[$rate->getCode()] = [
'code' => $rate->getCode(),
'method' => $rate->getCarrierTitle(),
diff --git a/Model/Config/Source/ActiveShippingMethods.php b/Model/Config/Source/ActiveShippingMethods.php
index a11d27ab..57c9d016 100644
--- a/Model/Config/Source/ActiveShippingMethods.php
+++ b/Model/Config/Source/ActiveShippingMethods.php
@@ -64,7 +64,7 @@ public function getShippingMethods()
$carrierTitle = $this->scopeConfig->getValue('carriers/' . $carrierCode . '/title');
$carrierName = $this->scopeConfig->getValue('carriers/' . $carrierCode . '/name');
}
- if ($code != 'instore_pickup') {
+ if ($code != 'instore_pickup' && $code != 'instore_instore') {
$methods[$code] = '[' . $carrierTitle . '] ' . $carrierName;
}
}
From c19d76443cdbc89bde11688ff40a320e43e17d26 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:25:22 +0200
Subject: [PATCH 36/47] Fix transaction mismatch error
---
Controller/Checkout/Exchange.php | 37 +++++++++++++++++---------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index 41c49360..1a12a7be 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -208,7 +208,7 @@ public function execute()
$params = $this->getPayLoad($this->getRequest());
$action = strtolower($params['action'] ?? '');
$payOrderId = $params['payOrderId'] ?? null;
- $orderEntityId = $params['orderId'] ?? null;
+ $orderId = $params['orderId'] ?? null;
$paymentProfileId = $params['paymentProfile'] ?? null;
$order = null;
@@ -232,6 +232,25 @@ public function execute()
}
}
+ try {
+ $this->config->configureSDK(true);
+ $transaction = Transaction::get($payOrderId);
+ } catch (\Exception $e) {
+ $this->payHelper->logCritical($e, $params, $order->getStore());
+ $this->removeProcessing($payOrderId, $action);
+ return $this->result->setContents('FALSE| Error fetching transaction. ' . $e->getMessage());
+ }
+
+ $orderIdTransaction = $transaction->getExtra1();
+
+ if ($orderId != $orderIdTransaction && !$this->isFastCheckout($params)) {
+ $this->payHelper->logCritical('Transaction mismatch ' . $orderId . ' / ' . $orderIdTransaction, $params, $order->getStore());
+ $this->removeProcessing($payOrderId, $action);
+ return $this->result->setContents('FALSE|Transaction mismatch:' . $transaction->getExtra3() . '-' . $transaction->getExtra1());
+ }
+
+ $orderEntityId = $transaction->getExtra3();
+
if (empty($payOrderId) || empty($orderEntityId)) {
$this->payHelper->logCritical('Exchange: order_id or orderEntity is not set', $params);
return $this->result->setContents('FALSE| order_id is not set in the request');
@@ -258,15 +277,6 @@ public function execute()
$this->config->setStore($order->getStore());
- try {
- $this->config->configureSDK(true);
- $transaction = Transaction::get($payOrderId);
- } catch (\Exception $e) {
- $this->payHelper->logCritical($e, $params, $order->getStore());
- $this->removeProcessing($payOrderId, $action);
- return $this->result->setContents('FALSE| Error fetching transaction. ' . $e->getMessage());
- }
-
if ($transaction->isPending()) {
if ($action == 'new_ppt') {
$this->removeProcessing($payOrderId, $action);
@@ -296,13 +306,6 @@ public function execute()
}
$payment = $order->getPayment();
- $orderEntityIdTransaction = $transaction->getExtra3();
-
- if ($orderEntityId != $orderEntityIdTransaction && !$this->isFastCheckout($params)) {
- $this->payHelper->logCritical('Transaction mismatch ' . $orderEntityId . ' / ' . $orderEntityIdTransaction, $params, $order->getStore());
- $this->removeProcessing($payOrderId, $action);
- return $this->result->setContents('FALSE|Transaction mismatch');
- }
if ($transaction->isRefunded(false) && substr($action, 0, 6) == 'refund') {
if ($this->config->refundFromPay() && $order->getTotalDue() == 0) {
From e793c81a9297215b06ac7140850eb5ec042e7fe0 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:03:45 +0200
Subject: [PATCH 37/47] Fix Extra3
---
Controller/Checkout/Exchange.php | 39 ++++++++++++++++----------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index 1a12a7be..0d9f5518 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -153,6 +153,7 @@ private function getPayLoad($_request)
$paymentProfile = $request->payment_profile_id ?? null;
$payOrderId = $request->order_id ?? null;
$orderId = $request->extra1 ?? null;
+ $extra3 = $request->extra3 ?? null;
$data = null;
} else {
# TGU
@@ -173,6 +174,7 @@ private function getPayLoad($_request)
$internalStateId = $data['object']['status']['code'] ?? '';
$internalStateName = $data['object']['status']['action'] ?? '';
$orderId = $data['object']['reference'] ?? '';
+ $extra3 = $data['object']['extra3'] ?? null;
$action = ($internalStateId == 100 || $internalStateName == 95) ? 'new_ppt' : 'pending';
$checkoutData = $data['object']['checkoutData'] ?? '';
}
@@ -183,6 +185,7 @@ private function getPayLoad($_request)
'paymentProfile' => $paymentProfile ?? null,
'payOrderId' => $payOrderId,
'orderId' => $orderId,
+ 'extra3' => $extra3 ?? null,
'internalStateId' => $internalStateId ?? null,
'internalStateName' => $internalStateName ?? null,
'checkoutData' => $checkoutData ?? null,
@@ -209,6 +212,7 @@ public function execute()
$action = strtolower($params['action'] ?? '');
$payOrderId = $params['payOrderId'] ?? null;
$orderId = $params['orderId'] ?? null;
+ $orderEntityId = $params['extra3'] ?? null;
$paymentProfileId = $params['paymentProfile'] ?? null;
$order = null;
@@ -232,25 +236,6 @@ public function execute()
}
}
- try {
- $this->config->configureSDK(true);
- $transaction = Transaction::get($payOrderId);
- } catch (\Exception $e) {
- $this->payHelper->logCritical($e, $params, $order->getStore());
- $this->removeProcessing($payOrderId, $action);
- return $this->result->setContents('FALSE| Error fetching transaction. ' . $e->getMessage());
- }
-
- $orderIdTransaction = $transaction->getExtra1();
-
- if ($orderId != $orderIdTransaction && !$this->isFastCheckout($params)) {
- $this->payHelper->logCritical('Transaction mismatch ' . $orderId . ' / ' . $orderIdTransaction, $params, $order->getStore());
- $this->removeProcessing($payOrderId, $action);
- return $this->result->setContents('FALSE|Transaction mismatch:' . $transaction->getExtra3() . '-' . $transaction->getExtra1());
- }
-
- $orderEntityId = $transaction->getExtra3();
-
if (empty($payOrderId) || empty($orderEntityId)) {
$this->payHelper->logCritical('Exchange: order_id or orderEntity is not set', $params);
return $this->result->setContents('FALSE| order_id is not set in the request');
@@ -277,6 +262,15 @@ public function execute()
$this->config->setStore($order->getStore());
+ try {
+ $this->config->configureSDK(true);
+ $transaction = Transaction::get($payOrderId);
+ } catch (\Exception $e) {
+ $this->payHelper->logCritical($e, $params, $order->getStore());
+ $this->removeProcessing($payOrderId, $action);
+ return $this->result->setContents('FALSE| Error fetching transaction. ' . $e->getMessage());
+ }
+
if ($transaction->isPending()) {
if ($action == 'new_ppt') {
$this->removeProcessing($payOrderId, $action);
@@ -306,6 +300,13 @@ public function execute()
}
$payment = $order->getPayment();
+ $orderEntityIdTransaction = $transaction->getExtra3();
+
+ if ($orderEntityId != $orderEntityIdTransaction && !$this->isFastCheckout($params)) {
+ $this->payHelper->logCritical('Transaction mismatch ' . $orderEntityId . ' / ' . $orderEntityIdTransaction, $params, $order->getStore());
+ $this->removeProcessing($payOrderId, $action);
+ return $this->result->setContents('FALSE|Transaction mismatch');
+ }
if ($transaction->isRefunded(false) && substr($action, 0, 6) == 'refund') {
if ($this->config->refundFromPay() && $order->getTotalDue() == 0) {
From 4c568004a3d6caeea8194511aba43e3e28a19bac Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:23:12 +0200
Subject: [PATCH 38/47] Improve fastcheckout exhchange
---
Controller/Checkout/Exchange.php | 24 +-
Model/PayPaymentCreateFastCheckoutOrder.php | 267 ++++++++++----------
2 files changed, 151 insertions(+), 140 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index 0d9f5518..ab4bb63d 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -222,17 +222,21 @@ public function execute()
if ($this->isFastCheckout($params)) {
try {
- $orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1];
- $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
- $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
- $order = array_shift($searchResult) ?? null;
- if (empty($order)) {
- $order = $this->payPaymentCreateFastCheckoutOrder->create($params);
- }
+ $order = $this->payPaymentCreateFastCheckoutOrder->create($params);
} catch (\Exception $e) {
- $this->payHelper->logCritical($e, $params);
- return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
+ $this->payHelper->logCritical($e->getMessage(), $params);
+ if ($e->getCode() == 10001) {
+ $orderId = explode('fastcheckout', $params['orderId']);
+ $quoteId = $orderId[1];
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
+ $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
+ $order = array_shift($searchResult) ?? null;
+ if (empty($order)) {
+ return $this->result->setContents('FALSE| Order can\'t be found.');
+ }
+ } else {
+ return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
+ }
}
}
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/PayPaymentCreateFastCheckoutOrder.php
index dd834bf2..b71552d8 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/PayPaymentCreateFastCheckoutOrder.php
@@ -4,6 +4,7 @@
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Model\CustomerFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Quote\Api\ShippingMethodManagementInterface;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteManagement;
@@ -86,136 +87,142 @@ public function __construct(
*/
public function create($params)
{
- $checkoutData = $params['checkoutData'];
-
- $customerData = $checkoutData['customer'] ?? null;
- $billingAddressData = $checkoutData['billingAddress'] ?? null;
- $shippingAddressData = $checkoutData['shippingAddress'] ?? null;
-
- if (empty($customerData) || empty($billingAddressData) || empty($shippingAddressData)) {
- throw new \Exception("Missing data, cannot create order.");
- }
-
- $payOrderId = $params['payOrderId'];
-
- $orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1];
-
- $quote = $this->quote->create()->loadByIdWithoutStore($quoteId);
- $storeId = $quote->getStoreId();
-
- $shippingMethodQuote = $quote->getShippingAddress()->getShippingMethod();
-
- $store = $this->storeManager->getStore($storeId);
- $websiteId = $store->getWebsiteId();
-
- $email = $customerData['email'];
- $customer = $this->customerFactory->create()
- ->setWebsiteId($websiteId)
- ->loadByEmail($email);
-
- if (!$customer->getEntityId()) {
- $customer->setWebsiteId($websiteId)
- ->setStore($store)
- ->setFirstname($customerData['firstName'])
- ->setLastname($customerData['lastName'])
- ->setEmail($email)
- ->setPassword($email);
- $customer->save();
- }
-
- $customer = $this->customerRepository->getById($customer->getEntityId());
-
- $quote->assignCustomer($customer);
- $quote->setSendConfirmation(1);
-
- $billingAddress = $quote->getBillingAddress()->addData(array(
- 'customer_address_id' => '',
- 'prefix' => '',
- 'firstname' => $billingAddressData['firstName'] ?? $customerData['firstName'],
- 'middlename' => '',
- 'lastname' => $billingAddressData['lastName'] ?? $customerData['lastName'],
- 'suffix' => '',
- 'company' => $customerData['company'] ?? '',
- 'street' => array(
- '0' => $billingAddressData['streetName'],
- '1' => $billingAddressData['streetNumber'] . ($billingAddressData['streetNumberAddition'] ?? ''),
- ),
- 'city' => $billingAddressData['city'],
- 'country_id' => $billingAddressData['countryCode'],
- 'region' => $billingAddressData['regionCode'] ?? '',
- 'postcode' => $billingAddressData['zipCode'],
- 'telephone' => $customerData['phone'],
- 'fax' => '',
- 'vat_id' => '',
- 'save_in_address_book' => 1,
- ));
-
- $shippingAddress = $quote->getShippingAddress()->addData(array(
- 'customer_address_id' => '',
- 'prefix' => '',
- 'firstname' => $shippingAddressData['firstName'] ?? $customerData['firstName'],
- 'middlename' => '',
- 'lastname' => $shippingAddressData['lastName'] ?? $customerData['lastName'],
- 'suffix' => '',
- 'company' => $customerData['company'] ?? '',
- 'street' => array(
- '0' => $shippingAddressData['streetName'],
- '1' => $shippingAddressData['streetNumber'] . ($shippingAddressData['streetNumberAddition'] ?? ''),
- ),
- 'city' => $shippingAddressData['city'],
- 'country_id' => $shippingAddressData['countryCode'],
- 'region' => $shippingAddressData['regionCode'] ?? '',
- 'postcode' => $shippingAddressData['zipCode'],
- 'telephone' => $customerData['phone'],
- 'fax' => '',
- 'vat_id' => '',
- 'save_in_address_book' => 1,
- ));
-
- $shippingAddress = $quote->getShippingAddress();
- $shippingAddress->setCollectShippingRates(true)->collectShippingRates();
-
- $shippingData = $this->shippingMethodManagementInterface->getList($quote->getId());
- $shippingMethodsAvaileble = [];
- foreach ($shippingData as $shipping) {
- $code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
- $shippingMethodsAvaileble[$code] = $code;
+ try {
+
+ $checkoutData = $params['checkoutData'];
+
+ $customerData = $checkoutData['customer'] ?? null;
+ $billingAddressData = $checkoutData['billingAddress'] ?? null;
+ $shippingAddressData = $checkoutData['shippingAddress'] ?? null;
+
+ if (empty($customerData) || empty($billingAddressData) || empty($shippingAddressData)) {
+ throw new \Exception("Missing data, cannot create order.");
+ }
+
+ $payOrderId = $params['payOrderId'];
+
+ $orderId = explode('fastcheckout', $params['orderId']);
+ $quoteId = $orderId[1];
+
+ $quote = $this->quote->create()->loadByIdWithoutStore($quoteId);
+ $storeId = $quote->getStoreId();
+
+ $shippingMethodQuote = $quote->getShippingAddress()->getShippingMethod();
+
+ $store = $this->storeManager->getStore($storeId);
+ $websiteId = $store->getWebsiteId();
+
+ $email = $customerData['email'];
+ $customer = $this->customerFactory->create()
+ ->setWebsiteId($websiteId)
+ ->loadByEmail($email);
+
+ if (!$customer->getEntityId()) {
+ $customer->setWebsiteId($websiteId)
+ ->setStore($store)
+ ->setFirstname($customerData['firstName'])
+ ->setLastname($customerData['lastName'])
+ ->setEmail($email)
+ ->setPassword($email);
+ $customer->save();
+ }
+
+ $customer = $this->customerRepository->getById($customer->getEntityId());
+
+ $quote->assignCustomer($customer);
+ $quote->setSendConfirmation(1);
+
+ $billingAddress = $quote->getBillingAddress()->addData(array(
+ 'customer_address_id' => '',
+ 'prefix' => '',
+ 'firstname' => $billingAddressData['firstName'] ?? $customerData['firstName'],
+ 'middlename' => '',
+ 'lastname' => $billingAddressData['lastName'] ?? $customerData['lastName'],
+ 'suffix' => '',
+ 'company' => $customerData['company'] ?? '',
+ 'street' => array(
+ '0' => $billingAddressData['streetName'],
+ '1' => $billingAddressData['streetNumber'] . ($billingAddressData['streetNumberAddition'] ?? ''),
+ ),
+ 'city' => $billingAddressData['city'],
+ 'country_id' => $billingAddressData['countryCode'],
+ 'region' => $billingAddressData['regionCode'] ?? '',
+ 'postcode' => $billingAddressData['zipCode'],
+ 'telephone' => $customerData['phone'],
+ 'fax' => '',
+ 'vat_id' => '',
+ 'save_in_address_book' => 1,
+ ));
+
+ $shippingAddress = $quote->getShippingAddress()->addData(array(
+ 'customer_address_id' => '',
+ 'prefix' => '',
+ 'firstname' => $shippingAddressData['firstName'] ?? $customerData['firstName'],
+ 'middlename' => '',
+ 'lastname' => $shippingAddressData['lastName'] ?? $customerData['lastName'],
+ 'suffix' => '',
+ 'company' => $customerData['company'] ?? '',
+ 'street' => array(
+ '0' => $shippingAddressData['streetName'],
+ '1' => $shippingAddressData['streetNumber'] . ($shippingAddressData['streetNumberAddition'] ?? ''),
+ ),
+ 'city' => $shippingAddressData['city'],
+ 'country_id' => $shippingAddressData['countryCode'],
+ 'region' => $shippingAddressData['regionCode'] ?? '',
+ 'postcode' => $shippingAddressData['zipCode'],
+ 'telephone' => $customerData['phone'],
+ 'fax' => '',
+ 'vat_id' => '',
+ 'save_in_address_book' => 1,
+ ));
+
+ $shippingAddress = $quote->getShippingAddress();
+ $shippingAddress->setCollectShippingRates(true)->collectShippingRates();
+
+ $shippingData = $this->shippingMethodManagementInterface->getList($quote->getId());
+ $shippingMethodsAvaileble = [];
+ foreach ($shippingData as $shipping) {
+ $code = $shipping->getCarrierCode() . '_' . $shipping->getMethodCode();
+ $shippingMethodsAvaileble[$code] = $code;
+ }
+
+ if (!empty($shippingMethodsAvaileble[$shippingMethodQuote])) {
+ $shippingMethod = $shippingMethodQuote;
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
+ } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
+ $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
+ }
+
+ if (empty($shippingMethod)) {
+ throw new \Exception("No shipping method availeble");
+ }
+
+ $shippingAddress->setShippingMethod($shippingMethod);
+
+ $quote->setPaymentMethod('paynl_payment_ideal');
+ $quote->setInventoryProcessed(false);
+ $quote->save();
+
+ // Set Sales Order Payment
+ $quote->getPayment()->importData(['method' => 'paynl_payment_ideal']);
+ $quote->collectTotals()->save();
+
+ $service = $this->quoteManagement->submit($quote);
+ $increment_id = $service->getRealOrderId();
+
+ $order = $this->orderFactory->create()->loadByIncrementId($increment_id);
+ $additionalData = $order->getPayment()->getAdditionalInformation();
+ $additionalData['transactionId'] = $payOrderId;
+ $order->getPayment()->setAdditionalInformation($additionalData);
+ $order->save();
+
+ $order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
+
+ return $order;
+
+ } catch (NoSuchEntityException $e) {
+ throw new \Exception("Order already exsists", 10001);
}
-
- if (!empty($shippingMethodsAvaileble[$shippingMethodQuote])) {
- $shippingMethod = $shippingMethodQuote;
- } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping')])) {
- $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping');
- } elseif (!empty($shippingMethodsAvaileble[$store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup')])) {
- $shippingMethod = $store->getConfig('payment/paynl_payment_ideal/fast_checkout_shipping_backup');
- }
-
- if (empty($shippingMethod)) {
- throw new \Exception("No shipping method availeble");
- }
-
- $shippingAddress->setShippingMethod($shippingMethod);
-
- $quote->setPaymentMethod('paynl_payment_ideal');
- $quote->setInventoryProcessed(false);
- $quote->save();
-
- // Set Sales Order Payment
- $quote->getPayment()->importData(['method' => 'paynl_payment_ideal']);
- $quote->collectTotals()->save();
-
- $service = $this->quoteManagement->submit($quote);
- $increment_id = $service->getRealOrderId();
-
- $order = $this->orderFactory->create()->loadByIncrementId($increment_id);
- $additionalData = $order->getPayment()->getAdditionalInformation();
- $additionalData['transactionId'] = $payOrderId;
- $order->getPayment()->setAdditionalInformation($additionalData);
- $order->save();
-
- $order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
-
- return $order;
}
}
From 22363f90cc49403f797b43d1bbfe593b953b791e Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:26:43 +0200
Subject: [PATCH 39/47] Code Polish
---
Model/PayPaymentCreateFastCheckoutOrder.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/PayPaymentCreateFastCheckoutOrder.php
index b71552d8..4714fcb5 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/PayPaymentCreateFastCheckoutOrder.php
@@ -88,7 +88,6 @@ public function __construct(
public function create($params)
{
try {
-
$checkoutData = $params['checkoutData'];
$customerData = $checkoutData['customer'] ?? null;
@@ -220,7 +219,6 @@ public function create($params)
$order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
return $order;
-
} catch (NoSuchEntityException $e) {
throw new \Exception("Order already exsists", 10001);
}
From 47fa7e3fc3a4c292b32c440cb5494de85f605cbe Mon Sep 17 00:00:00 2001
From: woutse
Date: Fri, 23 Aug 2024 16:58:51 +0200
Subject: [PATCH 40/47] Code polish
---
Controller/Checkout/Exchange.php | 19 ++++----
Controller/Checkout/Finish.php | 45 +++++++++++--------
...tOrder.php => CreateFastCheckoutOrder.php} | 2 +-
view/frontend/web/css/payFastCheckout.css | 12 +++--
4 files changed, 42 insertions(+), 36 deletions(-)
rename Model/{PayPaymentCreateFastCheckoutOrder.php => CreateFastCheckoutOrder.php} (99%)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index ab4bb63d..341df305 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -12,7 +12,7 @@
use Paynl\Payment\Controller\PayAction;
use Paynl\Payment\Helper\PayHelper;
use Paynl\Payment\Model\PayPayment;
-use Paynl\Payment\Model\PayPaymentCreateFastCheckoutOrder;
+use Paynl\Payment\Model\CreateFastCheckoutOrder;
use Paynl\Transaction;
class Exchange extends PayAction implements CsrfAwareActionInterface
@@ -38,9 +38,9 @@ class Exchange extends PayAction implements CsrfAwareActionInterface
private $payPayment;
/**
- * @var PayPaymentCreateFastCheckoutOrder
+ * @var CreateFastCheckoutOrder
*/
- private $payPaymentCreateFastCheckoutOrder;
+ private $createFastCheckoutOrder;
/**
*
@@ -88,7 +88,7 @@ public function validateForCsrf(RequestInterface $request): bool
* @param \Magento\Framework\Controller\Result\Raw $result
* @param OrderRepository $orderRepository
* @param PayPayment $payPayment
- * @param PayPaymentCreateFastCheckoutOrder $payPaymentCreateFastCheckoutOrder
+ * @param CreateFastCheckoutOrder $createFastCheckoutOrder
* @param PayHelper $payHelper
* @param OrderRepositoryInterface $orderRepositoryInterface
* @param SearchCriteriaBuilder $searchCriteriaBuilder
@@ -99,7 +99,7 @@ public function __construct(
\Magento\Framework\Controller\Result\Raw $result,
OrderRepository $orderRepository,
PayPayment $payPayment,
- PayPaymentCreateFastCheckoutOrder $payPaymentCreateFastCheckoutOrder,
+ CreateFastCheckoutOrder $createFastCheckoutOrder,
PayHelper $payHelper,
OrderRepositoryInterface $orderRepositoryInterface,
SearchCriteriaBuilder $searchCriteriaBuilder
@@ -108,7 +108,7 @@ public function __construct(
$this->config = $config;
$this->orderRepository = $orderRepository;
$this->payPayment = $payPayment;
- $this->payPaymentCreateFastCheckoutOrder = $payPaymentCreateFastCheckoutOrder;
+ $this->createFastCheckoutOrder = $createFastCheckoutOrder;
$this->payHelper = $payHelper;
$this->orderRepositoryInterface = $orderRepositoryInterface;
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -222,12 +222,12 @@ public function execute()
if ($this->isFastCheckout($params)) {
try {
- $order = $this->payPaymentCreateFastCheckoutOrder->create($params);
+ $order = $this->createFastCheckoutOrder->create($params);
} catch (\Exception $e) {
$this->payHelper->logCritical($e->getMessage(), $params);
if ($e->getCode() == 10001) {
$orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1];
+ $quoteId = $orderId[1] ?? '';
$searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
$searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
$order = array_shift($searchResult) ?? null;
@@ -245,7 +245,8 @@ public function execute()
return $this->result->setContents('FALSE| order_id is not set in the request');
}
- if (empty($order)) {
+ # In case of fastcheckout, there may already be an order.
+ if (empty($order))
try {
$order = $this->orderRepository->get($orderEntityId);
if (empty($order)) {
diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php
index 34be2f0b..91c776d4 100644
--- a/Controller/Checkout/Finish.php
+++ b/Controller/Checkout/Finish.php
@@ -129,6 +129,30 @@ private function checkEmpty($field, string $name, int $errorCode, string $desc =
}
}
+ /**
+ * @return string
+ * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ private function getFastCheckoutPath()
+ {
+ $path = $bSuccess ? Config::FINISH_PAY_FC : ($bPending ? Config::PENDING_PAY : 'checkout/cart');
+
+ $session = $this->checkoutSession;
+ $quote = $session->getQuote();
+
+ if ($bSuccess || $bPending) {
+ $quote->setIsActive(false);
+ $this->quoteRepository->save($quote);
+ } else {
+ $quote->setIsActive(true);
+ $this->quoteRepository->save($quote);
+ $session->replaceQuote($quote);
+ }
+
+ return $path;
+ }
+
/**
* @return resultRedirectFactory|void
*/
@@ -152,27 +176,10 @@ public function execute()
try {
if ($magOrderId == 'fc') {
- if ($bSuccess) {
- $resultRedirect->setPath(Config::FINISH_PAY_FC, ['_query' => ['utm_nooverride' => '1']]);
- } elseif ($bPending) {
- $resultRedirect->setPath(Config::PENDING_PAY, ['_query' => ['utm_nooverride' => '1']]);
- } else {
- $resultRedirect->setPath('checkout/cart', ['_query' => ['utm_nooverride' => '1']]);
- }
-
- $session = $this->checkoutSession;
- $quote = $session->getQuote();
- if ($bSuccess || $bPending) {
- $quote->setIsActive(false);
- $this->quoteRepository->save($quote);
- } else {
- $quote->setIsActive(true);
- $this->quoteRepository->save($quote);
- $session->replaceQuote($quote);
- }
-
+ $resultRedirect->setPath($this->getFastCheckoutPath(), ['_query' => ['utm_nooverride' => '1']]);
return $resultRedirect;
}
+
$this->checkEmpty($magOrderId, 'magOrderId', 1012);
$order = $this->orderRepository->get($magOrderId);
$this->checkEmpty($order, 'order', 1013);
diff --git a/Model/PayPaymentCreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
similarity index 99%
rename from Model/PayPaymentCreateFastCheckoutOrder.php
rename to Model/CreateFastCheckoutOrder.php
index 4714fcb5..fdc5db20 100644
--- a/Model/PayPaymentCreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -11,7 +11,7 @@
use Magento\Sales\Model\OrderFactory;
use Magento\Store\Model\StoreManagerInterface;
-class PayPaymentCreateFastCheckoutOrder
+class CreateFastCheckoutOrder
{
/**
* @var StoreManagerInterface
diff --git a/view/frontend/web/css/payFastCheckout.css b/view/frontend/web/css/payFastCheckout.css
index 781376ac..d9671629 100644
--- a/view/frontend/web/css/payFastCheckout.css
+++ b/view/frontend/web/css/payFastCheckout.css
@@ -3,8 +3,6 @@
width: 100%;
}
-
-
#paynl_fast_checkout_cart button,
#paynl_fast_checkout_product button,
#paynl_fast_checkout_fallback button,
@@ -23,7 +21,7 @@
background-position: 8px center;
}
-#top-cart-btn-fastcheckout{
+#top-cart-btn-fastcheckout {
margin-top: 5px;
}
@@ -51,15 +49,15 @@
width: 100%;
}
-@media all and (min-width: 769px),print {
+@media all and (min-width: 769px), print {
#paynl_fast_checkout_product {
display: block;
margin-bottom: 0;
margin-right: 1%;
width: 49%;
}
-
- #paynl_fast_checkout_fallback button{
+
+ #paynl_fast_checkout_fallback button {
max-width: 250px;
}
-}
\ No newline at end of file
+}
From 7cf9217940dcd7e535edb9ac4c1c8406d133e43a Mon Sep 17 00:00:00 2001
From: woutse
Date: Fri, 23 Aug 2024 17:05:06 +0200
Subject: [PATCH 41/47] Code polish
---
Controller/Checkout/Exchange.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index 341df305..cb549106 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -246,7 +246,7 @@ public function execute()
}
# In case of fastcheckout, there may already be an order.
- if (empty($order))
+ if (empty($order)) {
try {
$order = $this->orderRepository->get($orderEntityId);
if (empty($order)) {
From 9504f10096dfeef05e29ef31f3da25efb4f29e97 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:15:54 +0200
Subject: [PATCH 42/47] Move order search code
---
Controller/Checkout/Exchange.php | 35 ++-------------------
Model/CreateFastCheckoutOrder.php | 52 ++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index cb549106..2023481a 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -2,17 +2,15 @@
namespace Paynl\Payment\Controller\Checkout;
-use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\App\Request\InvalidRequestException;
-use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\OrderRepository;
use Paynl\Payment\Controller\CsrfAwareActionInterface;
use Paynl\Payment\Controller\PayAction;
use Paynl\Payment\Helper\PayHelper;
-use Paynl\Payment\Model\PayPayment;
use Paynl\Payment\Model\CreateFastCheckoutOrder;
+use Paynl\Payment\Model\PayPayment;
use Paynl\Transaction;
class Exchange extends PayAction implements CsrfAwareActionInterface
@@ -48,16 +46,6 @@ class Exchange extends PayAction implements CsrfAwareActionInterface
*/
private $payHelper;
- /**
- * @var OrderRepositoryInterface
- */
- private $orderRepositoryInterface;
-
- /**
- * @var SearchCriteriaBuilder
- */
- private $searchCriteriaBuilder;
-
/**
* @var
*/
@@ -90,8 +78,6 @@ public function validateForCsrf(RequestInterface $request): bool
* @param PayPayment $payPayment
* @param CreateFastCheckoutOrder $createFastCheckoutOrder
* @param PayHelper $payHelper
- * @param OrderRepositoryInterface $orderRepositoryInterface
- * @param SearchCriteriaBuilder $searchCriteriaBuilder
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
@@ -100,9 +86,7 @@ public function __construct(
OrderRepository $orderRepository,
PayPayment $payPayment,
CreateFastCheckoutOrder $createFastCheckoutOrder,
- PayHelper $payHelper,
- OrderRepositoryInterface $orderRepositoryInterface,
- SearchCriteriaBuilder $searchCriteriaBuilder
+ PayHelper $payHelper
) {
$this->result = $result;
$this->config = $config;
@@ -110,8 +94,6 @@ public function __construct(
$this->payPayment = $payPayment;
$this->createFastCheckoutOrder = $createFastCheckoutOrder;
$this->payHelper = $payHelper;
- $this->orderRepositoryInterface = $orderRepositoryInterface;
- $this->searchCriteriaBuilder = $searchCriteriaBuilder;
parent::__construct($context);
}
@@ -225,18 +207,7 @@ public function execute()
$order = $this->createFastCheckoutOrder->create($params);
} catch (\Exception $e) {
$this->payHelper->logCritical($e->getMessage(), $params);
- if ($e->getCode() == 10001) {
- $orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1] ?? '';
- $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
- $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
- $order = array_shift($searchResult) ?? null;
- if (empty($order)) {
- return $this->result->setContents('FALSE| Order can\'t be found.');
- }
- } else {
- return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
- }
+ return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
}
}
diff --git a/Model/CreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
index fdc5db20..2543d920 100644
--- a/Model/CreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -4,10 +4,12 @@
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Model\CustomerFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Quote\Api\ShippingMethodManagementInterface;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteManagement;
+use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\OrderFactory;
use Magento\Store\Model\StoreManagerInterface;
@@ -53,6 +55,16 @@ class CreateFastCheckoutOrder
*/
private $shippingMethodManagementInterface;
+ /**
+ * @var OrderRepositoryInterface
+ */
+ private $orderRepositoryInterface;
+
+ /**
+ * @var SearchCriteriaBuilder
+ */
+ private $searchCriteriaBuilder;
+
/**
* @param StoreManagerInterface $storeManager
* @param QuoteFactory $quote
@@ -61,6 +73,8 @@ class CreateFastCheckoutOrder
* @param CustomerRepositoryInterface $customerRepository
* @param OrderFactory $orderFactory
* @param ShippingMethodManagementInterface $shippingMethodManagementInterface
+ * @param OrderRepositoryInterface $orderRepositoryInterface
+ * @param SearchCriteriaBuilder $searchCriteriaBuilder
*/
public function __construct(
StoreManagerInterface $storeManager,
@@ -69,7 +83,9 @@ public function __construct(
CustomerFactory $customerFactory,
CustomerRepositoryInterface $customerRepository,
OrderFactory $orderFactory,
- ShippingMethodManagementInterface $shippingMethodManagementInterface
+ ShippingMethodManagementInterface $shippingMethodManagementInterface,
+ OrderRepositoryInterface $orderRepositoryInterface,
+ SearchCriteriaBuilder $searchCriteriaBuilder
) {
$this->storeManager = $storeManager;
$this->quote = $quote;
@@ -78,6 +94,8 @@ public function __construct(
$this->customerRepository = $customerRepository;
$this->orderFactory = $orderFactory;
$this->shippingMethodManagementInterface = $shippingMethodManagementInterface;
+ $this->orderRepositoryInterface = $orderRepositoryInterface;
+ $this->searchCriteriaBuilder = $searchCriteriaBuilder;
}
/**
@@ -87,22 +105,22 @@ public function __construct(
*/
public function create($params)
{
- try {
- $checkoutData = $params['checkoutData'];
+ $checkoutData = $params['checkoutData'];
- $customerData = $checkoutData['customer'] ?? null;
- $billingAddressData = $checkoutData['billingAddress'] ?? null;
- $shippingAddressData = $checkoutData['shippingAddress'] ?? null;
+ $customerData = $checkoutData['customer'] ?? null;
+ $billingAddressData = $checkoutData['billingAddress'] ?? null;
+ $shippingAddressData = $checkoutData['shippingAddress'] ?? null;
- if (empty($customerData) || empty($billingAddressData) || empty($shippingAddressData)) {
- throw new \Exception("Missing data, cannot create order.");
- }
+ if (empty($customerData) || empty($billingAddressData) || empty($shippingAddressData)) {
+ throw new \Exception("Missing data, cannot create order.");
+ }
- $payOrderId = $params['payOrderId'];
+ $payOrderId = $params['payOrderId'];
- $orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1];
+ $orderId = explode('fastcheckout', $params['orderId']);
+ $quoteId = $orderId[1];
+ try {
$quote = $this->quote->create()->loadByIdWithoutStore($quoteId);
$storeId = $quote->getStoreId();
@@ -217,10 +235,14 @@ public function create($params)
$order->save();
$order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
-
- return $order;
} catch (NoSuchEntityException $e) {
- throw new \Exception("Order already exsists", 10001);
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
+ $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
+ $order = array_shift($searchResult) ?? null;
+ if (empty($order)) {
+ throw new \Exception("Order can't be found.");
+ }
}
+ return $order;
}
}
From 36b199bd0e8e36e69ebaab570bf38fa937680e12 Mon Sep 17 00:00:00 2001
From: woutse
Date: Mon, 26 Aug 2024 09:58:18 +0200
Subject: [PATCH 43/47] Code polish
---
Controller/Checkout/Exchange.php | 5 +----
Model/CreateFastCheckoutOrder.php | 7 +++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index 2023481a..ed19576f 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -41,7 +41,6 @@ class Exchange extends PayAction implements CsrfAwareActionInterface
private $createFastCheckoutOrder;
/**
- *
* @var \Paynl\Payment\Helper\PayHelper;
*/
private $payHelper;
@@ -52,7 +51,6 @@ class Exchange extends PayAction implements CsrfAwareActionInterface
private $headers;
/**
- *
* @param RequestInterface $request
* @return null
*/
@@ -138,7 +136,6 @@ private function getPayLoad($_request)
$extra3 = $request->extra3 ?? null;
$data = null;
} else {
- # TGU
if ($_request->isGet() || !$this->isSignExchange()) {
$data['object'] = $request->object ?? null;
} else {
@@ -161,7 +158,7 @@ private function getPayLoad($_request)
$checkoutData = $data['object']['checkoutData'] ?? '';
}
- // Return mapped data so it works for all type of exchanges.
+ # Return mapped data so it works for all type of exchanges.
return [
'action' => $action,
'paymentProfile' => $paymentProfile ?? null,
diff --git a/Model/CreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
index 2543d920..bc6c886c 100644
--- a/Model/CreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -106,7 +106,6 @@ public function __construct(
public function create($params)
{
$checkoutData = $params['checkoutData'];
-
$customerData = $checkoutData['customer'] ?? null;
$billingAddressData = $checkoutData['billingAddress'] ?? null;
$shippingAddressData = $checkoutData['shippingAddress'] ?? null;
@@ -118,7 +117,7 @@ public function create($params)
$payOrderId = $params['payOrderId'];
$orderId = explode('fastcheckout', $params['orderId']);
- $quoteId = $orderId[1];
+ $quoteId = $orderId[1] ?? '';
try {
$quote = $this->quote->create()->loadByIdWithoutStore($quoteId);
@@ -221,7 +220,7 @@ public function create($params)
$quote->setInventoryProcessed(false);
$quote->save();
- // Set Sales Order Payment
+ # Set Sales Order Payment
$quote->getPayment()->importData(['method' => 'paynl_payment_ideal']);
$quote->collectTotals()->save();
@@ -238,7 +237,7 @@ public function create($params)
} catch (NoSuchEntityException $e) {
$searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
$searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
- $order = array_shift($searchResult) ?? null;
+ $order = array_shift($searchResult ?? []) ?? null;
if (empty($order)) {
throw new \Exception("Order can't be found.");
}
From 80f2f117ca3a0d3a70567148d1d27daf400a96e9 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:19:56 +0200
Subject: [PATCH 44/47] Code Polish
---
Controller/Checkout/Exchange.php | 13 ++++++++++---
Controller/Checkout/Finish.php | 5 ++---
Model/CreateFastCheckoutOrder.php | 20 ++++++++++++++------
Model/PayPaymentCreateFastCheckout.php | 2 +-
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index ed19576f..edd9bdc0 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -179,7 +179,7 @@ private function getPayLoad($_request)
*/
private function isFastCheckout($params)
{
- return strpos($params['orderId'], "fastcheckout") !== false && !empty($params['checkoutData'] ?? '');
+ return strpos($params['orderId'] ?? '', "fastcheckout") !== false && !empty($params['checkoutData'] ?? '');
}
/**
@@ -202,20 +202,27 @@ public function execute()
if ($this->isFastCheckout($params)) {
try {
$order = $this->createFastCheckoutOrder->create($params);
+ $orderEntityId = $order->getId();
} catch (\Exception $e) {
$this->payHelper->logCritical($e->getMessage(), $params);
return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
}
+ } elseif (strpos($params['extra3'] ?? '', "fastcheckout") !== false) {
+ return $this->result->setContents('TRUE| Ignoring fastcheckout.');
}
- if (empty($payOrderId) || empty($orderEntityId)) {
- $this->payHelper->logCritical('Exchange: order_id or orderEntity is not set', $params);
+ if (empty($payOrderId)) {
+ $this->payHelper->logCritical('Exchange: order_id is not set', $params);
return $this->result->setContents('FALSE| order_id is not set in the request');
}
# In case of fastcheckout, there may already be an order.
if (empty($order)) {
try {
+ if (empty($orderEntityId)) {
+ $this->payHelper->logCritical('Exchange: orderEntityId is not set', $params);
+ throw new \Exception('orderEntityId is not set in the request');
+ }
$order = $this->orderRepository->get($orderEntityId);
if (empty($order)) {
$this->payHelper->logCritical('Cannot load order: ' . $orderEntityId);
diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php
index 91c776d4..4432d92a 100644
--- a/Controller/Checkout/Finish.php
+++ b/Controller/Checkout/Finish.php
@@ -134,10 +134,9 @@ private function checkEmpty($field, string $name, int $errorCode, string $desc =
* @throws \Magento\Framework\Exception\LocalizedException
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
- private function getFastCheckoutPath()
+ private function getFastCheckoutPath($bSuccess, $bPending)
{
$path = $bSuccess ? Config::FINISH_PAY_FC : ($bPending ? Config::PENDING_PAY : 'checkout/cart');
-
$session = $this->checkoutSession;
$quote = $session->getQuote();
@@ -176,7 +175,7 @@ public function execute()
try {
if ($magOrderId == 'fc') {
- $resultRedirect->setPath($this->getFastCheckoutPath(), ['_query' => ['utm_nooverride' => '1']]);
+ $resultRedirect->setPath($this->getFastCheckoutPath($bSuccess, $bPending), ['_query' => ['utm_nooverride' => '1']]);
return $resultRedirect;
}
diff --git a/Model/CreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
index bc6c886c..62fd8dbc 100644
--- a/Model/CreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -235,12 +235,20 @@ public function create($params)
$order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
} catch (NoSuchEntityException $e) {
- $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
- $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
- $order = array_shift($searchResult ?? []) ?? null;
- if (empty($order)) {
- throw new \Exception("Order can't be found.");
- }
+ $order = $this->getExsistingOrder($quoteId);
+ }
+ return $order;
+ }
+
+ public function getExsistingOrder($quoteId)
+ {
+ $searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
+ $searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
+ if (is_array($searchResult) && !empty($searchResult)) {
+ $order = array_shift($searchResult);
+ }
+ if (empty($order)) {
+ throw new \Exception("Order can't be found.");
}
return $order;
}
diff --git a/Model/PayPaymentCreateFastCheckout.php b/Model/PayPaymentCreateFastCheckout.php
index a8381f67..abe01ef8 100644
--- a/Model/PayPaymentCreateFastCheckout.php
+++ b/Model/PayPaymentCreateFastCheckout.php
@@ -98,7 +98,7 @@ public function getData()
$this->_add($stats, 'object', $this->methodInstance->getVersion() . ' | fc');
$this->_add($stats, 'extra1', '');
$this->_add($stats, 'extra2', '');
- $this->_add($stats, 'extra3', '');
+ $this->_add($stats, 'extra3', $this->reference);
$this->_add($parameters, 'stats', $stats);
return $parameters;
From 9eb023938a6eeccb6635baa55b805d8295a1f284 Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:36:28 +0200
Subject: [PATCH 45/47] Code Polish
---
Controller/Checkout/Finish.php | 3 +++
Model/CreateFastCheckoutOrder.php | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php
index 4432d92a..d22bdfd2 100644
--- a/Controller/Checkout/Finish.php
+++ b/Controller/Checkout/Finish.php
@@ -130,9 +130,12 @@ private function checkEmpty($field, string $name, int $errorCode, string $desc =
}
/**
+ * @param boolean $bSuccess
+ * @param boolean $bPending
* @return string
* @throws \Magento\Framework\Exception\LocalizedException
* @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
*/
private function getFastCheckoutPath($bSuccess, $bPending)
{
diff --git a/Model/CreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
index 62fd8dbc..c946e515 100644
--- a/Model/CreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -240,6 +240,11 @@ public function create($params)
return $order;
}
+ /**
+ * @param string $quoteId
+ * @return Order
+ * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
+ */
public function getExsistingOrder($quoteId)
{
$searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
From 3837173a8b06edd80ecc8a9ba85c3bd80e54a3c9 Mon Sep 17 00:00:00 2001
From: woutse
Date: Mon, 26 Aug 2024 16:00:35 +0200
Subject: [PATCH 46/47] Code polish
---
Controller/Checkout/Exchange.php | 6 +++---
Model/CreateFastCheckoutOrder.php | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index edd9bdc0..0dbf9f14 100755
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -148,7 +148,7 @@ private function getPayLoad($_request)
throw new Exception('Cant handle exchange type other then order');
}
}
- $this->payHelper->logDebug('payload', $data);
+
$payOrderId = $data['object']['orderId'] ?? '';
$internalStateId = $data['object']['status']['code'] ?? '';
$internalStateName = $data['object']['status']['action'] ?? '';
@@ -208,7 +208,8 @@ public function execute()
return $this->result->setContents('FALSE| Error creating fast checkout order. ' . $e->getMessage());
}
} elseif (strpos($params['extra3'] ?? '', "fastcheckout") !== false) {
- return $this->result->setContents('TRUE| Ignoring fastcheckout.');
+ # Disabled fastcheckout related actions.
+ return $this->result->setContents('TRUE| Ignoring fastcheckout action ' . $action);
}
if (empty($payOrderId)) {
@@ -220,7 +221,6 @@ public function execute()
if (empty($order)) {
try {
if (empty($orderEntityId)) {
- $this->payHelper->logCritical('Exchange: orderEntityId is not set', $params);
throw new \Exception('orderEntityId is not set in the request');
}
$order = $this->orderRepository->get($orderEntityId);
diff --git a/Model/CreateFastCheckoutOrder.php b/Model/CreateFastCheckoutOrder.php
index c946e515..9fa63d74 100644
--- a/Model/CreateFastCheckoutOrder.php
+++ b/Model/CreateFastCheckoutOrder.php
@@ -235,7 +235,7 @@ public function create($params)
$order->addStatusHistoryComment(__('PAY. - Created iDEAL Fast Checkout order'))->save();
} catch (NoSuchEntityException $e) {
- $order = $this->getExsistingOrder($quoteId);
+ $order = $this->getExistingOrder($quoteId);
}
return $order;
}
@@ -243,9 +243,10 @@ public function create($params)
/**
* @param string $quoteId
* @return Order
+ * @throws \Exception
* @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
*/
- public function getExsistingOrder($quoteId)
+ public function getExistingOrder($quoteId)
{
$searchCriteria = $this->searchCriteriaBuilder->addFilter('quote_id', $quoteId)->create();
$searchResult = $this->orderRepositoryInterface->getList($searchCriteria)->getItems();
From 4eab887ab4b12f89649d3592130df9717a51500d Mon Sep 17 00:00:00 2001
From: kevinverschoor <61683999+kevinverschoor@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:04:34 +0200
Subject: [PATCH 47/47] Remove minicart cacheable
---
view/frontend/layout/default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index e175f972..70c722e9 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -5,7 +5,7 @@
-
+ Paynl\Payment\ViewModel\FastCheckout