Merge pull request #213 from paynl/feature/PLUG-3911

PLUG-3911 - Reserve order Id

Controller/Checkout/FastCheckoutStart.php

@@ -244,13 +244,19 @@ public function execute()
                 throw new \Exception('empty amount', FastCheckoutStart::FC_EMPTY_BASKET);
             }
 
+            if (!empty($store->getConfig('payment/paynl_payment_ideal/fast_checkout_reserveOrderId')) && $store->getConfig('payment/paynl_payment_ideal/fast_checkout_reserveOrderId') == 1) { // phpcs:ignore
+                $quote->reserveOrderId();
+                $quote->save();
+            }
+
             $payTransaction = (new PayPaymentCreateFastCheckout(
                 $methodInstance,
                 $fcAmount * 100,
                 $arrProducts,
                 $this->storeManager->getStore()->getBaseUrl(),
                 $this->cart->getQuote()->getId(),
-                $this->storeManager->getStore()->getCurrentCurrencyCode()
+                $this->storeManager->getStore()->getCurrentCurrencyCode(),
+                $quote->getReservedOrderId() ?? null
             ))->create();
 
             $this->getResponse()->setNoCacheHeaders();

Model/PayPaymentCreate.php

@@ -79,7 +79,7 @@ class PayPaymentCreate
     /**
      * @var float|string|null
      */
-    private $orderId;
+    protected $orderId;
 
     /**
      * @var Order
@@ -260,7 +260,7 @@ public function setCurrency($currency)
     /**
      * @return float|string|null
      */
-    private function getDescription()
+    public function getDescription()
     {
         $prefix = $this->scopeConfig->getValue('payment/paynl/order_description_prefix', 'store');
         return !empty($prefix) ? $prefix . $this->orderId : $this->orderId;

Model/PayPaymentCreateFastCheckout.php

@@ -21,6 +21,11 @@ class PayPaymentCreateFastCheckout extends PayPaymentCreate
      */
     private $reference = '';
 
+    /**
+     * @var string
+     */
+    private $reservedOrderId = '';
+
     /**
      * @param \Paynl\Payment\Model\Paymentmethod\Paymentmethod $methodInstance
      * @param string $amount Amount to start fastCheckout with
@@ -31,19 +36,22 @@ class PayPaymentCreateFastCheckout extends PayPaymentCreate
      * @throws \Exception
      * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
      */
-    public function __construct($methodInstance, $amount, $products, $baseUrl, $quoteId, $currency)
+    public function __construct($methodInstance, $amount, $products, $baseUrl, $quoteId, $currency, $reservedOrderId)
     {
         $fastCheckout = parent::__construct(null, $methodInstance);
 
         $finishUrl = $baseUrl . 'paynl/checkout/finish/?entityid=fc';
         $exchangeUrl = $baseUrl . 'paynl/checkout/exchange/';
 
+        $this->orderId = $reservedOrderId;
+
         $fastCheckout->setAmount($amount);
         $fastCheckout->setCurrency($currency);
         $fastCheckout->setFinishURL($finishUrl);
         $fastCheckout->setExchangeURL($exchangeUrl);
         $fastCheckout->setProducts($products);
         $fastCheckout->reference = 'fastcheckout' . $quoteId;
+        $fastCheckout->reservedOrderId = $reservedOrderId;
     }
 
     /**
@@ -72,7 +80,7 @@ public function getData()
         $parameters['paymentMethod'] = ['id' => $this->paymentMethodId];
 
         $this->_add($parameters, 'returnUrl', $this->paymentData['returnURL']);
-        $this->_add($parameters, 'description', '');
+        $this->_add($parameters, 'description', $this->getDescription());
         $this->_add($parameters, 'reference', $this->reference);
         $this->_add($parameters, 'exchangeUrl', $this->paymentData['exchangeURL']);
 
@@ -96,7 +104,7 @@ public function getData()
         $this->_add($stats, 'info', '');
         $this->_add($stats, 'tool', '');
         $this->_add($stats, 'object', $this->methodInstance->getVersion() . ' | fc');
-        $this->_add($stats, 'extra1', '');
+        $this->_add($stats, 'extra1', $this->reservedOrderId);
         $this->_add($stats, 'extra2', '');
         $this->_add($stats, 'extra3', $this->reference);
         $this->_add($parameters, 'stats', $stats);

etc/adminhtml/paymentmethods/ideal.xml

@@ -246,6 +246,13 @@ Using the intermediate screen will allow users to select their own shipping meth
 This setting does not effect the product page. If fast checkout is enabled for the product page, the fast checkout button will always be shown.</tooltip>
                 <comment>Show the fast checkout button on the cart page, only for guest customers.</comment>
             </field>
+            <field id="fast_checkout_reserveOrderId" translate="label" type="select" sortOrder="184" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Reserve order Id</label>
+                <frontend_model>Paynl\Payment\Block\Adminhtml\Render\Checkbox</frontend_model>
+                <config_path>payment/paynl_payment_ideal/fast_checkout_reserveOrderId</config_path>
+                <tooltip>When enabled, the fast checkout order id will be reserved on start and send to Pay.</tooltip>
+                <comment>Reserve the order id on fast checkout start.</comment>
+            </field>
         </group>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>

i18n/de_AT.csv

@@ -314,4 +314,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
 "Finnish","Finnisch"
 "Czech","Tschechisch"
 "Greek","Griechisch"
-"Japanese","Japanisch"
+"Japanese","Japanisch"
+"Reserve order Id","Reservieren Sie Bestellnummer"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Wenn aktiviert, wird die fastcheckout Bestellnummer beim Start reserviert und an Pay. gesendet."
+"Reserve the order id on fast checkout start.","Reservieren Sie die Bestellnummer beim Start des fastcheckout."

i18n/de_CH.csv

@@ -301,6 +301,9 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
 "Show notice and abort fast checkout","Hinweis anzeigen und Schnellkasse abbrechen"
 "Show intermediate screen to select shipping method","Zwischenbildschirm zur Auswahl der Versandart anzeigen"
 "Thank you for your purchase, as soon as the payment is completed you will receive an email.","Vielen Dank für Ihren Kauf, sobald die Zahlung abgeschlossen ist, erhalten Sie eine E-Mail."
+"Reserve order Id","Reservieren Sie Bestellnummer"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Wenn aktiviert, wird die fastcheckout Bestellnummer beim Start reserviert und an Pay. gesendet."
+"Reserve the order id on fast checkout start.","Reservieren Sie die Bestellnummer beim Start des fastcheckout."
 "Use browser language","Browsersprache verwenden"
 "Use website language","Verwenden Sie die Website-Sprache"
 "American","Amerikanisch"

i18n/de_DE.csv

@@ -316,4 +316,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
 "Finnish","Finnisch"
 "Czech","Tschechisch"
 "Greek","Griechisch"
-"Japanese","Japanisch"
+"Japanese","Japanisch"
+"Reserve order Id","Reservieren Sie Bestellnummer"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Wenn aktiviert, wird die fastcheckout Bestellnummer beim Start reserviert und an Pay. gesendet."
+"Reserve the order id on fast checkout start.","Reservieren Sie die Bestellnummer beim Start des fastcheckout."

i18n/de_LU.csv

@@ -317,4 +317,7 @@ Diese Einstellung wirkt sich nicht auf die Produktseite aus. Wenn der schnelle C
 "Finnish","Finnisch"
 "Czech","Tschechisch"
 "Greek","Griechisch"
-"Japanese","Japanisch"
+"Japanese","Japanisch"
+"Reserve order Id","Reservieren Sie Bestellnummer"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Wenn aktiviert, wird die fastcheckout Bestellnummer beim Start reserviert und an Pay. gesendet."
+"Reserve the order id on fast checkout start.","Reservieren Sie die Bestellnummer beim Start des fastcheckout."

i18n/en_US.csv

@@ -381,4 +381,7 @@ This setting does not effect the product page. If fast checkout is enabled for t
 "Finnish","Finnish"
 "Czech","Czech"
 "Greek","Greek"
-"Japanese","Japanese"
+"Japanese","Japanese"
+"Reserve order Id","Reserve order Id"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","When enabled, the fast checkout order id will be reserved on start and send to Pay."
+"Reserve the order id on fast checkout start.","Reserve the order id on fast checkout start."

i18n/fr_BE.csv

@@ -318,4 +318,7 @@ Ce paramètre n'affecte pas la page produit. Si le paiement rapide est activé p
 "Finnish","Finlandais"
 "Czech","Tchèque"
 "Greek","Grec"
-"Japanese","Japonais"
+"Japanese","Japonais"
+"Reserve order Id","Numéro de commande de réserve"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Lorsqu'elle est activée, l'identifiant de commande de fastcheckout sera réservé au démarrage et envoyé à Pay."
+"Reserve the order id on fast checkout start.","Réservez l'identifiant de commande au démarrage du fastcheckout."

i18n/nl_BE.csv

@@ -375,4 +375,7 @@ Deze instelling heeft geen effect op de productpagina. Als snel bestellen is ing
 "Finnish","Fins"
 "Czech","Tsjechisch"
 "Greek","Grieks"
-"Japanese","Japans"
+"Japanese","Japans"
+"Reserve order Id","Reserveer order Id"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Als deze optie is ingeschakeld, wordt de Fast Checkout order Id bij de start gereserveerd en naar Pay verzonden."
+"Reserve the order id on fast checkout start.","Reserveer de order Id bij het starten van de fast checkout."

i18n/nl_NL.csv

@@ -367,4 +367,7 @@ Deze instelling heeft geen effect op de productpagina. Als snel bestellen is ing
 "Finnish","Fins"
 "Czech","Tsjechisch"
 "Greek","Grieks"
-"Japanese","Japans"
+"Japanese","Japans"
+"Reserve order Id","Reserveer order Id"
+"When enabled, the fast checkout order id will be reserved on start and send to Pay.","Als deze optie is ingeschakeld, wordt de Fast Checkout order Id bij de start gereserveerd en naar Pay verzonden."
+"Reserve the order id on fast checkout start.","Reserveer de order Id bij het starten van de fast checkout."