Merge pull request #54 from two-inc/brtkwr-two/abn-43-magento-admin-p…

…ortal-order-displayed-with-status-such-as-two

fix: Two pending status

Model/Two.php

@@ -45,8 +45,7 @@ class Two extends AbstractMethod
 
     public const STATUS_NEW = 'two_new';
     public const STATUS_FAILED = 'two_failed';
-    public const STATUS_APPROVED = 'APPROVED';
-    public const STATUS_TWO_PENDING = 'pending_two_payment';
+    public const STATUS_PENDING = 'pending_two_payment';
     /**
      * @var RequestInterface
      */
@@ -218,7 +217,7 @@ public function authorize(InfoInterface $payment, $amount)
             throw new LocalizedException($error);
         }
 
-        if ($response['status'] !== static::STATUS_APPROVED) {
+        if ($response['status'] !== 'APPROVED') {
             $this->logRepository->addDebugLog(
                 sprintf('Order was not accepted by %s', $this->configRepository::PROVIDER),
                 $response

Model/Ui/ConfigProvider.php

@@ -64,11 +64,8 @@ public function getConfig(): array
         $provider = $this->configRepository::PROVIDER;
         $tryAgainLater = __('Please try again later.');
         $soleTraderaccountCouldNotBeVerified = __('Your sole trader account could not be verified.');
-        // Set isTermsAndConditionsEnabled based on provider
         $paymentTerms = __("Payment Terms");
-        $paymentTermsLink = $this->configRepository::PAYMENT_TERMS_LINK;
-        // This check here is present to only enable the terms and conditions
-        $isTermsAndConditionsEnabled = !empty($paymentTermsLink);
+        $paymentTermsLink = $this->configRepository->getCheckoutPageUrl() . '/terms';
 
         return [
             'payment' => [
@@ -87,8 +84,7 @@ public function getConfig(): array
                     'isOrderNoteFieldEnabled' => $this->configRepository->isOrderNoteEnabled(),
                     'isPONumberFieldEnabled' => $this->configRepository->isPONumberEnabled(),
                     'isTwoLinkEnabled' => $this->configRepository->isTwoLinkEnabled(),
-                    'isTermsAndConditionsEnabled' => $isTermsAndConditionsEnabled,
-                    'paymentTermsLink' => $paymentTermsLink,
+                    'isPaymentTermsEnabled' => true,
                     'redirectMessage' => __(
                         'You will be redirected to %1 when you place order.',
                         $provider

Plugin/Model/Sales/AfterPlaceOrder.php

@@ -33,7 +33,7 @@ public function afterPlace(Order $subject, Order $order)
     {
         if ($order->getPayment()->getMethod() == Two::CODE) {
             $order->setState(Order::STATE_PENDING_PAYMENT);
-            $order->setStatus(Two::STATUS_TWO_PENDING);
+            $order->setStatus(Two::STATUS_PENDING);
             $this->orderRepository->save($order);
         }
         return $order;

Setup/Patch/Data/OrderStatuses.php

@@ -28,6 +28,7 @@ class OrderStatuses implements DataPatchInterface
     private $moduleDataSetup;
 
     /**
+     * @param ConfigRepository $configRepository
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
@@ -47,8 +48,8 @@ public function apply()
 
         $data = [];
         $statuses = [
-            Two::STATUS_NEW => __('%1 New Order', $this->configRepository::PROVIDER),
-            Two::STATUS_FAILED => __('%1 Failed', $this->configRepository::PROVIDER),
+            Two::STATUS_NEW => sprintf('%s New Order', $this->configRepository::PROVIDER),
+            Two::STATUS_FAILED => sprintf('%s Failed', $this->configRepository::PROVIDER),
         ];
 
         foreach ($statuses as $code => $info) {

Setup/Patch/Data/PendingPaymentStatus.php

@@ -10,23 +10,32 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Two\Gateway\Model\Two;
+use Two\Gateway\Api\Config\RepositoryInterface as ConfigRepository;
 
 /**
  * PendingPaymentStatus Data Patch
  */
 class PendingPaymentStatus implements DataPatchInterface
 {
+    /**
+     * @var ConfigRepository
+     */
+    private $configRepository;
+
     /**
      * @var ModuleDataSetupInterface
      */
     private $moduleDataSetup;
 
     /**
+     * @param ConfigRepository $configRepository
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
+        ConfigRepository $configRepository,
         ModuleDataSetupInterface $moduleDataSetup
     ) {
+        $this->configRepository = $configRepository;
         $this->moduleDataSetup = $moduleDataSetup;
     }
 
@@ -44,13 +53,13 @@ public function apply()
 
         $this->moduleDataSetup->getConnection()->insert(
             $this->moduleDataSetup->getTable('sales_order_status'),
-            ['status' => Two::STATUS_TWO_PENDING, 'label' => 'Two Pending']
+            ['status' => Two::STATUS_PENDING, 'label' => sprintf('%s Pending', $this->configRepository::PROVIDER)]
         );
 
         $this->moduleDataSetup->getConnection()->insert(
             $this->moduleDataSetup->getTable('sales_order_status_state'),
             [
-                'status' => Two::STATUS_TWO_PENDING,
+                'status' => Two::STATUS_PENDING,
                 'state' => 'pending_payment',
                 'is_default' => 1,
                 'visible_on_front' => 0
@@ -87,7 +96,7 @@ private function isStatusAdded(): bool
         $select = $this->moduleDataSetup->getConnection()->select()
             ->from($this->moduleDataSetup->getTable('sales_order_status'), 'status')
             ->where('status = :status');
-        $bind = [':status' => Two::STATUS_TWO_PENDING];
+        $bind = [':status' => Two::STATUS_PENDING];
         return (bool)$this->moduleDataSetup->getConnection()->fetchOne($select, $bind);
     }
 }

bumpver.toml

@@ -1,5 +1,5 @@
 [tool.bumpver]
-current_version = "1.6.0"
+current_version = "1.6.3"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit_message = "chore: Bump version {old_version} -> {new_version}"
 commit = true

composer.json

@@ -2,7 +2,7 @@
     "name": "two-inc/magento2",
     "description": "Two B2B BNPL payments extension",
     "type": "magento2-module",
-    "version": "1.6.0",
+    "version": "1.6.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

etc/config.xml

@@ -11,7 +11,7 @@
         <payment>
             <two_payment>
                 <active>1</active>
-                <version>1.6.0</version>
+                <version>1.6.3</version>
                 <title>Business invoice - 30 days</title>
                 <mode>sandbox</mode>
                 <invoice_type>FUNDED_INVOICE</invoice_type>

i18n/en_US.csv

@@ -1,9 +1,7 @@
 "%1 Credit Note","%1 Credit Note"
 "%1 Decline reason: %2","%1 Decline reason: %2"
 "%1 Details","%1 Details"
-"%1 Failed","%1 Failed"
 "%1 Invoice","%1 Invoice"
-"%1 New Order","%1 New Order"
 "%1 Order ID","%1 Order ID"
 "%1 [Trace ID: %2]","%1 [Trace ID: %2]"
 "%1 order has been marked as cancelled","%1 order has been marked as cancelled"

i18n/nb_NO.csv

@@ -1,9 +1,7 @@
 "%1 Credit Note","%1 kreditnota"
 "%1 Decline reason: %2","%1 Årsak til avvisning: %2"
 "%1 Details","%1 Detaljer"
-"%1 Failed","%1 Mislyktes"
 "%1 Invoice","%1 Faktura"
-"%1 New Order","%1 Ny ordre"
 "%1 Order ID","%1 Bestillings-ID"
 "%1 [Trace ID: %2]","%1 [Sporings-ID: %2]"
 "%1 order has been marked as cancelled","%1 ordre er merket som kansellert"

i18n/nl_NL.csv

@@ -1,9 +1,7 @@
 "%1 Credit Note","%1 Creditnota"
 "%1 Decline reason: %2","%1 Reden voor afwijzing: %2"
 "%1 Details","%1 Gegevens"
-"%1 Failed","%1 Mislukt"
 "%1 Invoice","%1 Factuur"
-"%1 New Order","%1 Nieuwe bestelling"
 "%1 Order ID","%1 Bestelnummer"
 "%1 [Trace ID: %2]","%1 [Trace-ID: %2]"
 "%1 order has been marked as cancelled","%1 bestelling is gemarkeerd als geannuleerd"

i18n/sv_SE.csv

@@ -1,9 +1,7 @@
 "%1 Credit Note","%1 Kreditnota"
 "%1 Decline reason: %2","%1 Orsak till avslag: %2"
 "%1 Details","%1 Detaljer"
-"%1 Failed","%1 Misslyckades"
 "%1 Invoice","%1 Faktura"
-"%1 New Order","%1 Ny beställning"
 "%1 Order ID","%1 Beställnings-ID"
 "%1 [Trace ID: %2]","%1 [Spår-ID: %2]"
 "%1 order has been marked as cancelled","%1 beställning har markerats som avbruten"

view/frontend/web/js/view/payment/method-renderer/two_payment.js

@@ -44,8 +44,8 @@ define([
         redirectMessage: config.redirectMessage,
         paymentTermsMessage: config.paymentTermsMessage,
         termsNotAcceptedMessage: config.termsNotAcceptedMessage,
-        isTermsAndConditionsEnabled: config.isTermsAndConditionsEnabled,
-        termsAccepted: ko.observable(false),
+        isPaymentTermsEnabled: config.isPaymentTermsEnabled,
+        isPaymentTermsAccepted: ko.observable(false),
         orderIntentApprovedMessage: config.orderIntentApprovedMessage,
         orderIntentDeclinedMessage: config.orderIntentDeclinedMessage,
         generalErrorMessage: config.generalErrorMessage,
@@ -86,10 +86,11 @@ define([
             this.configureFormValidation();
             this.popupMessageListener();
         },
-        checkTerms: function (data, event) {
-            // Update the termsAccepted observable based on the checkbox state
-            // And added logging
-            console.debug({ logger: 'checkTerms', termsAccepted: this.termsAccepted() });
+        logIsPaymentsAccepted: function (data, event) {
+            console.debug({
+                logger: 'logIsPaymentsAccepted',
+                isPaymentTermsAccepted: this.isPaymentTermsAccepted()
+            });
         },
         fillCompanyData: function ({ companyId, companyName }) {
             console.debug({ logger: 'twoPayment.fillCompanyData', companyId, companyName });
@@ -207,17 +208,20 @@ define([
             }
         },
         placeOrder: function (data, event) {
-            // Additional logging to check termsAccepted
-            console.debug({ logger: 'placeOrder', termsAccepted: this.termsAccepted() });
+            // Additional logging to check isPaymentTermsAccepted
+            console.debug({
+                logger: 'placeOrder',
+                isPaymentTermsAccepted: this.isPaymentTermsAccepted()
+            });
             if (event) event.preventDefault();
-            if (this.isTermsAndConditionsEnabled && !this.termsAccepted()) {
+            if (this.isPaymentTermsEnabled && !this.isPaymentTermsAccepted()) {
                 this.processTermsNotAcceptedErrorResponse();
                 return;
             }
             if (
                 this.validate() &&
                 additionalValidators.validate() &&
-                this.termsAccepted() === true &&
+                this.isPaymentTermsAccepted() === true &&
                 this.isPlaceOrderActionAllowed() === true
             )
                 this.placeOrderBackend();

view/frontend/web/template/payment/two_payment.html

@@ -236,12 +236,12 @@
                         />
                     </div>
                 </div>
-                <!-- ko if: isTermsAndConditionsEnabled -->
+                <!-- ko if: isPaymentTermsEnabled -->
                 <div class="payment-method-content terms-container">
                     <input
                         type="checkbox"
                         name="terms-checkbox"
-                        data-bind="checked: termsAccepted, event: { change: checkTerms }"
+                        data-bind="checked: isPaymentTermsAccepted, event: { change: logIsPaymentsAccepted }"
                     />
                     <span class="terms-text" data-bind="html: paymentTermsMessage"></span>
                 </div>