Merge pull request #172 from 202-ecommerce/release/x

Release 5.7.5
202ecommerce · Jan 25, 2023 · aaa905c · aaa905c
2 parents 5cee41e + c058f43
commit aaa905c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/202/build.xml b/202/build.xml
@@ -30,7 +30,7 @@
     <property name="src-dir" value="${basedir}" />
     <property name="TARGETNAME" value="paypal" />
     <property name="TARGETBRANCH" value="${env.GIT_BRANCH}" />
-    <property name="TARGETVERSION" value="5.7.4" />
+    <property name="TARGETVERSION" value="5.7.5" />
     <property name="PHPVERSION" value="5.6" />
     <property name="PSVERSION" value="1.7.5.2" />
 

diff --git a/classes/PUI/FraudNetForm.php b/classes/PUI/FraudNetForm.php
@@ -72,8 +72,7 @@ protected function getFraudSessionId()
 
     protected function getSourceId()
     {
-        //todo: use format merchantId + page name
-        return '[use-client-id-here]-checkout-page';
+        return (new PsMerchantId($this->method))->get() . '-checkout-page';
     }
 
     protected function getUserData()

diff --git a/classes/PUI/PsMerchantId.php b/classes/PUI/PsMerchantId.php
@@ -44,6 +44,6 @@ public function __construct($method = null)
 
     public function get()
     {
-        return 'PrestaShop_' . md5($this->method->getClientId());
+        return 'PrestaShop_' . md5($this->method->getClientId($this->method->isSandbox()));
     }
 }
diff --git a/views/templates/pui/fraudNetForm.tpl b/views/templates/pui/fraudNetForm.tpl
@@ -36,7 +36,7 @@
   {
     "f":"{/literal}{$sessionId}{literal}",
     "s":"{/literal}{$sourceId}{literal}",
-    "sandbox": {/literal}{$isSandbox}{literal}
+    "sandbox": {/literal}{if $isSandbox}true{else}false{/if}{literal}
   }
 </script>
 {/literal}