INGA-111: User sees extra fields "Card number" and "Expiry date" for …

…saved card (#27207) - remove saved validation riles in case of initialization
oroinc · Mar 12, 2020 · 68fe85a · 68fe85a
1 parent 2ac6825
commit 68fe85a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Method/Handler/SepaPaymentProductHandler.php b/Method/Handler/SepaPaymentProductHandler.php
@@ -136,7 +136,7 @@ private function createToken(
                 Iban::NAME => $this->getAdditionalDataFieldByKey($paymentTransaction, self::IBAN_OPTION_KEY),
                 PaymentProductId::NAME => EnabledProductsDataProvider::SEPA_ID,
                 MandateApproval\MandateSignatureDate::NAME => $currentDateTime->format('Ymd'),
-            ],
+            ]
         );
 
         return TokenResponse::create($response->toArray());

diff --git a/Resources/public/js/app/components/ingenico-payment-component.js b/Resources/public/js/app/components/ingenico-payment-component.js
@@ -72,6 +72,9 @@ define(function(require) {
         connectSdk: null,
 
         /**
+         * Contains saved original validation rules from the SDK in case of using tokenization
+         * This validation rules will be restored to SDK in case customer doesn't want to use saved (tokenized) card
+         *
          * @property {Object}
          */
         _requiredFields: {},
@@ -423,6 +426,8 @@ define(function(require) {
                     paymentProductFieldsHolder.find('select').inputWidget('create', 'select2');
 
                     if (this.isTokenizationApplicable()) {
+                        // Clean up saved required fields validation rules on initialization
+                        delete this._requiredFields[this.currentPaymentProduct.id];
                         this.$el.on('change.' + this.cid, this.getTokenFieldSelector(), this.onTokenChange.bind(this));
                     }
 
@@ -638,6 +643,9 @@ define(function(require) {
         },
 
         _saveRequiredFieldsList: function() {
+            // Skip if current payment product is not defined
+            // or we already saved original validation rules from the SDK
+            // (in case customer changed from one tokenized card to another)
             if (!this.currentPaymentProduct || this._requiredFields[this.currentPaymentProduct.id]) {
                 return;
             }