Merge branch 'hotfix/2.9.2'

hipay · Dec 9, 2019 · 18e587e · 18e587e
2 parents 28c35f9 + 0919ca7
commit 18e587e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 2.9.2
+
+- **Fix**: Password and account changing date on DSP2
+
 # Version 2.9.1
 
 - **Fix**: Basket saving on payment failure

diff --git a/src/hipay_enterprise/classes/apiFormatter/ThreeDS/AccountInfoFormatter.php b/src/hipay_enterprise/classes/apiFormatter/ThreeDS/AccountInfoFormatter.php
@@ -66,9 +66,15 @@ private function getCustomerInfo()
         $customerInfo = new CustomerInfo();
 
         if (!$this->customer->is_guest) {
-            $customerInfo->account_change = (int)(date('Ymd', strtotime($this->customer->date_upd)));
             $customerInfo->opening_account_date = (int)(date('Ymd', strtotime($this->customer->date_add)));
-            $customerInfo->password_change = (int)(date('Ymd', strtotime($this->customer->last_passwd_gen)));
+
+            $accountChange = ($this->customer->date_upd && strtotime($this->customer->date_upd) > strtotime($this->customer->date_add)) ?
+                $this->customer->date_upd : $this->customer->date_add;
+            $customerInfo->account_change = (int)(date('Ymd', strtotime($accountChange)));
+
+            $passwordChange = ($this->customer->last_passwd_gen && strtotime($this->customer->last_passwd_gen) > strtotime($this->customer->date_add)) ?
+                $this->customer->last_passwd_gen : $this->customer->date_add;
+            $customerInfo->password_change = (int)(date('Ymd', strtotime($passwordChange)));
         }
 
         return $customerInfo;

diff --git a/src/hipay_enterprise/composer.json b/src/hipay_enterprise/composer.json
@@ -1,22 +1,22 @@
 {
   "name": "Hipay Enterprise Prestashop", 
   "license": "Apache 2.0", 
-  "config": {
-    "vendor-dir": "lib/vendor"
+  "require-dev": {
+    "phpunit/phpunit": "5.6.1"
   }, 
   "require": {
     "hipay/hipay-fullservice-sdk-php": "^2.5.0"
   }, 
+  "version": "1.0.0", 
   "authors": [
     {
       "homepage": "http://www.hipay.com", 
       "name": "HiPay", 
       "email": "[email protected]"
     }
   ], 
-  "version": "1.0.0", 
-  "require-dev": {
-    "phpunit/phpunit": "5.6.1"
+  "config": {
+    "vendor-dir": "lib/vendor"
   }, 
   "description": "Hipay enterprise module for Prestashop"
 }
diff --git a/src/hipay_enterprise/hipay_enterprise.php b/src/hipay_enterprise/hipay_enterprise.php
@@ -38,7 +38,7 @@ public function __construct()
 
         $this->name = 'hipay_enterprise';
         $this->tab = 'payments_gateways';
-        $this->version = '2.9.1';
+        $this->version = '2.9.2';
         $this->module_key = 'c3c030302335d08603e8669a5210c744';
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
         $this->currencies = true;