Merge pull request #116 from paynl/feature/PLUG-234

Add fix for logged in accounts and add the gender to the transaction …
paynl · Feb 9, 2021 · 3f20cae · 3f20cae
2 parents e0932e2 + 15ab080
commit 3f20cae
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/Model/Paymentmethod/Paylink.php b/Model/Paymentmethod/Paylink.php
@@ -143,7 +143,6 @@ public function initialize($paymentAction, $stateObject)
             parent::initialize($paymentAction, $stateObject);
         }
     }
-
 
     public function assignData(\Magento\Framework\DataObject $data)
     {

diff --git a/Model/Paymentmethod/PaymentMethod.php b/Model/Paymentmethod/PaymentMethod.php
@@ -130,6 +130,22 @@ public function getCompany()
         return $this->_scopeConfig->getValue('payment/' . $this->_code . '/showforcompany', 'store');
     }
 
+    public function genderConversion($gender)
+    {
+        switch ($gender) {
+            case '1':
+                $gender = 'M';
+                break;
+            case '2':
+                $gender = 'F';
+                break;
+            default:
+                $gender = null;
+                break;
+        }
+        return $gender;
+    }
+
     public function initialize($paymentAction, $stateObject)
     {
         $status = $this->getConfigData('order_status');
@@ -269,9 +285,15 @@ protected function doStartTransaction(Order $order)
                 'phoneNumber' => $arrBillingAddress['telephone'],
                 'emailAddress' => $arrBillingAddress['email'],
             );
+
             if (isset($additionalData['dob'])) {
                 $enduser['dob'] = $additionalData['dob'];
             }
+
+            if (isset($additionalData['gender'])) {
+                $enduser['gender'] = $additionalData['gender'];
+            }
+            $enduser['gender'] = $this->genderConversion((empty($enduser['gender'])) ? $order->getCustomerGender($order) : $enduser['gender']);
 
             if (isset($arrBillingAddress['company']) && !empty($arrBillingAddress['company'])) {
               $enduser['company']['name'] = $arrBillingAddress['company'];

diff --git a/Plugin/OrderPaymentAdditionalInformation.php b/Plugin/OrderPaymentAdditionalInformation.php
@@ -24,18 +24,11 @@ public function afterGetAdditionalInformation(Payment $subject, $result)
             if (empty($result['dob']) && $order->getCustomerDob()) {
                 $result['dob'] = (new \DateTime($order->getCustomerDob()))->format('Y-m-d');
             }
-            if (empty($result['gender']) && $order->getCustomerGender()) {
+            if (empty($result['gender']) && ($order->getCustomerGender() || !empty($order->getCustomerId()))) {
                 $gender = $order->getCustomerGender();
-                switch ($gender) {
-                    case '1':
-                        $gender = 'M';
-                        break;
-                    case '2':
-                        $gender = 'F';
-                        break;
-                    default:
-                        $gender = null;
-                        break;
+                if (empty($gender) && !empty($order->getCustomerId())) {
+                    $customer = $this->customerRepository->getById($order->getCustomerId());
+                    $gender = $customer->getGender();
                 }
                 if (!empty($gender)) {
                     $result['gender'] = $gender;
-Original file line number
+Diff line change
@@ Expand Up / @@ -143,7 +143,6 @@ public function initialize($paymentAction, $stateObject) @@
                 parent::initialize($paymentAction, $stateObject);
             }
         }
         public function assignData(\Magento\Framework\DataObject $data)
         {
@@ Expand Down @@