PW-304 Inserted Personal number for Nordic countries

Block/Redirect/Redirect.php

@@ -274,8 +274,6 @@ class Redirect extends \Magento\Payment\Block\Form
                 $formFields = $this->setOpenInvoiceData($formFields);
 
                 $formFields['shopper.gender'] = $this->getGenderText($this->_order->getCustomerGender());
-
-
                 $dob = $this->_order->getCustomerDob();
                 if ($dob) {
                     $formFields['shopper.dateOfBirthDayOfMonth'] = trim($this->_getDate($dob, 'd'));
@@ -285,6 +283,10 @@ class Redirect extends \Magento\Payment\Block\Form
 
                 // For klarna acceptPrivacyPolicy to skip HPP page
                 if ($brandCode == "klarna") {
+                    $ssn = $this->_order->getPayment()->getAdditionalInformation('ssn');
+                    if (!empty($ssn)) {
+                        $formFields['shopper.socialSecurityNumber'] = $this->_order->getPayment()->getAdditionalInformation('ssn');
+                    }
                     //  // needed for DE and AT
                     $formFields['klarna.acceptPrivacyPolicy'] = 'true';
                 }
@@ -324,7 +326,7 @@ class Redirect extends \Magento\Payment\Block\Form
 
 //        echo "GENDER" . $this->_order->getCustomerGender();
 //
-//        print_r($formFields);die();
+        //print_r($formFields);die();
         return $formFields;
     }
 
@@ -336,9 +338,7 @@ class Redirect extends \Magento\Payment\Block\Form
     protected function setBillingAddressData($formFields)
     {
         $billingAddress = $this->_order->getBillingAddress();
-
         if ($billingAddress) {
-
             $formFields['shopper.firstName'] = trim($billingAddress->getFirstname());
             $middleName = trim($billingAddress->getMiddlename());
             if ($middleName != "") {
@@ -347,7 +347,6 @@ class Redirect extends \Magento\Payment\Block\Form
 
             $formFields['shopper.lastName'] = trim($billingAddress->getLastname());
             $formFields['shopper.telephoneNumber'] = trim($billingAddress->getTelephone());
-
             $street = $this->_adyenHelper->getStreet($billingAddress);
 
             if (isset($street['name']) && $street['name'] != "") {

Model/Ui/AdyenHppConfigProvider.php

@@ -142,7 +142,7 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
         );
         $config['payment'] ['adyenHpp']['ratePayId'] = $this->_adyenHelper->getRatePayId();
         $config['payment'] ['adyenHpp']['deviceIdentToken'] = md5($this->_session->getQuoteId().date('c'));
-
+        $config['payment'] ['adyenHpp']['nordicCountries'] = ['SE','NO','DK', 'FI'];
 
         return $config;
     }

Observer/AdyenHppDataAssignObserver.php

@@ -37,6 +37,7 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
     const DOB = 'dob';
     const TELEPHONE = 'telephone';
     const DF_VALUE = 'df_value';
+    const SSN = 'ssn';
 
 
     /**
@@ -48,7 +49,8 @@ class AdyenHppDataAssignObserver extends AbstractDataAssignObserver
         self::GENDER,
         self::DOB,
         self::TELEPHONE,
-        self::DF_VALUE
+        self::DF_VALUE,
+        self::SSN
     ];
 
     /**

view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js

@@ -137,7 +137,17 @@ define(
                     result.validate = function () {
                         return self.validate();
                     }
-
+                    result.isPaymentMethodOpenInvoiceMethod = function () {
+                        return value.isPaymentMethodOpenInvoiceMethod;
+                    }
+                    result.getSsnFormat = function(){
+                        if (quote.billingAddress().countryId == "NO") {
+                            return 5;
+                        }
+                        else {
+                            return 4;
+                        }
+                    }
                     if(value.brandCode == "ideal") {
                         result.issuerIds = value.issuers;
                         result.issuerId = ko.observable(null);
@@ -146,12 +156,32 @@ define(
                         result.gender = ko.observable(window.checkoutConfig.payment.adyenHpp.gender);
                         result.dob = ko.observable(window.checkoutConfig.payment.adyenHpp.dob);
                         result.datepickerValue = ko.observable(); // needed ??
+                        result.ssn = ko.observable();
+
+                        result.getRatePayDeviceIdentToken = function () {
+                            return window.checkoutConfig.payment.adyenHpp.deviceIdentToken;
                         }
-                    result.isPaymentMethodOpenInvoiceMethod = function() {
-                        return value.isPaymentMethodOpenInvoiceMethod;
+                        result.showGender = function () {
+                            return window.checkoutConfig.payment.adyenHpp.showGender;
+                        }
+                        result.showDob = function () {
+                            return window.checkoutConfig.payment.adyenHpp.showDob;
+                        }
+                        result.showTelephone = function () {
+                            return window.checkoutConfig.payment.adyenHpp.showTelephone;
+                        }
+                        result.showSsn = function () {
+                            if (value.brandCode.indexOf("klarna") >= 0) {
+                                var ba = quote.billingAddress();
+                                if (ba != null) {
+                                    var nordicCountriesList = window.checkoutConfig.payment.adyenHpp.nordicCountries;
+                                    if (nordicCountriesList.indexOf(ba.countryId) >= 0) {
+                                        return true;
+                                    }
+                                }
+                            }
+                            return false;
                         }
-                    result.getRatePayDeviceIdentToken = function() {
-                        return window.checkoutConfig.payment.adyenHpp.deviceIdentToken;
                     }
                     return result;
                 });
@@ -194,6 +224,7 @@ define(
                         additionalData.gender = this.gender();
                         additionalData.dob = this.dob();
                         additionalData.telephone = this.telephone();
+                        additionalData.ssn = this.ssn();
                         if(brandCode() == "ratepay"){
                             additionalData.df_value = this.getRatePayDeviceIdentToken();
                         }
@@ -247,15 +278,6 @@ define(
             isIconEnabled: function() {
                 return window.checkoutConfig.payment.adyen.showLogo;
             },
-            showGender: function() {
-                return window.checkoutConfig.payment.adyenHpp.showGender;
-            },
-            showDob: function() {
-                return window.checkoutConfig.payment.adyenHpp.showDob;
-            },
-            showTelephone: function() {
-                return window.checkoutConfig.payment.adyenHpp.showTelephone;
-            },
             validate: function () {
                 return true;
             },

view/frontend/web/template/payment/hpp-form.html

@@ -70,7 +70,7 @@
 
 
                     <!-- ko if: isPaymentMethodOpenInvoiceMethod() -->
-                        <!-- ko if: $parent.showGender() -->
+                        <!-- ko if: showGender() -->
                             <div class="field gender_type type required">
                                     <label data-bind="attr: {for: getCode() + '_gender_type'}" class="label">
                                         <span><!-- ko text: $t('Gender')--><!-- /ko --></span>
@@ -90,7 +90,7 @@
                             </div>
                         <!--/ko-->
 
-                        <!-- ko if: $parent.showDob() -->
+                        <!-- ko if: showDob() -->
                             <div class="field required">
                                 <label data-bind="attr: {for: getCode() + '_dob'}" class="label">
                                     <span><!-- ko text: $t('Date of Birth')--><!-- /ko --></span>
@@ -111,7 +111,7 @@
                             </div>
                         <!--/ko-->
 
-                        <!-- ko if: $parent.showTelephone() -->
+                        <!-- ko if: showTelephone() -->
                             <div class="field required">
                                 <label data-bind="attr: {for: getCode() + '_telephone'}" class="label">
                                     <span><!-- ko text: $t('Telephone')--><!-- /ko --></span>
@@ -131,6 +131,29 @@
                                 </div>
                             </div>
                         <!--/ko-->
+
+                    <!-- ko if: showSsn() -->
+                    <div class="field required">
+                        <label data-bind="attr: {for: getCode() + '_ssn'}" class="label">
+                            <span><!-- ko text: $t('Personal number (last digits)')--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text" class="input-text"
+                                   name="payment[ssn]"
+                                   data-bind="
+                                           attr: {
+                                                id: getCode() + '_ssn',
+                                                title: $t('Social Security Number'),
+                                                'data-container': getCode() + '-ssn',
+                                                'data-validate': JSON.stringify({'required-number':true }),
+                                                maxlength : getSsnFormat()
+                                            },
+                                            value: ssn"
+                            />
+                        </div>
+                    </div>
+                    <!--/ko-->
+
                     <!--/ko-->
                 </fieldset>
                 <div class="checkout-agreements-block">