Fix bug on default chain selected

BitCannaGlobal · Jan 19, 2023 · 9c7b4fe · 9c7b4fe
1 parent 019dbc9
commit 9c7b4fe
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/controllers/front/validation.php b/controllers/front/validation.php
@@ -395,7 +395,7 @@ public function postProcess()
           $checkError = true;     
       }
 
-      if($cart->id && $checkError === false) {
+      if($cart->id && $checkError === false && $unserializeChains !== false) {
         $this->context->smarty->assign('totalAmount', round(Configuration::get('BITCANNA_TOTAL_'.$cart->id), 4));
         $this->context->smarty->assign('memo', $returnTrans[0]["memo"]);
         $this->context->smarty->assign('viewDenom', $returnTrans[0]["viewDenom"]);
@@ -405,7 +405,7 @@ public function postProcess()
         $this->context->smarty->assign('unserializeChains', $unserializeChains);
         $this->context->smarty->assign('mainDomain', Context::getContext()->shop->getBaseURL(true));
         $this->setTemplate('module:cosmospay/views/templates/front/payment_return.tpl');        
-      } elseif ($checkError === true) {
+      } elseif ($checkError === true || $unserializeChains === false) {
         $this->setTemplate('module:cosmospay/views/templates/front/bad_config.tpl');    
       } else {
         $this->context->smarty->assign('mainDomain', Context::getContext()->shop->getBaseURL(true));

diff --git a/cosmospay.php b/cosmospay.php
@@ -46,7 +46,7 @@ public function __construct()
     {
         $this->name = 'cosmospay';
         $this->tab = 'payments_gateways';
-        $this->version = '1.0.14';
+        $this->version = '1.0.15';
         $this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
         $this->author = 'Bitcanna';
         $this->controllers = array('validation');
@@ -129,14 +129,16 @@ public function processConfiguration()
 
         Configuration::updateValue('CONF_COSMOS_TITLE', $moduleTitle); 
         Configuration::updateValue('CONF_COSMOS_DESC', $moduleDesc);
-
-        if (!$checkChains) {
+        Configuration::updateValue('CONF_COSMOS_CHAINS', serialize($checkChains));
+        Configuration::updateValue('CONF_COSMOS_CHAINS_ADDR', serialize($input));  
+
+        /*if (!$checkChains) {
           Configuration::updateValue('CONF_COSMOS_CHAINS', '');
           Configuration::updateValue('CONF_COSMOS_CHAINS_ADDR', '');        
         } else {
           Configuration::updateValue('CONF_COSMOS_CHAINS', serialize($checkChains));
           Configuration::updateValue('CONF_COSMOS_CHAINS_ADDR', serialize($input));        
-        }
+        }*/
 
 
         $this->context->smarty->assign('confirmation', 'ok');

diff --git a/js/mainscript.js b/js/mainscript.js
@@ -1,4 +1,4 @@
-function startChecking( order_id, mainDomain, memo, isBlocked, nonceSelectChain, nonceDeleteOrder, nonceSwitchMethod ) {
+function startChecking( order_id, mainDomain, memo, isBlocked, nonceSelectChain, nonceDeleteOrder, nonceSwitchMethod, setDefault ) {
 
   $( '#chainIcon' ).hide()
   $( '#chainIcon2' ).hide()
@@ -27,8 +27,8 @@ function startChecking( order_id, mainDomain, memo, isBlocked, nonceSelectChain,
     }) 
   } else {
     $('#mainTransaction').show();
-    $.post( mainDomain+"/index.php?fc=module&module=cosmospay&controller=validation", { switch: 'BitCanna', order_id: order_id, nonce: nonceSelectChain }, async function( result ) {
-      let foundChain = await exportCosmosConfig.initConfig.find( element => element.name === 'BitCanna' )
+    $.post( mainDomain+"/index.php?fc=module&module=cosmospay&controller=validation", { switch: setDefault, order_id: order_id, nonce: nonceSelectChain }, async function( result ) {
+      let foundChain = await exportCosmosConfig.initConfig.find( element => element.name === setDefault )
 
       if(result.status === "canceled") {
         window.location.replace(mainDomain + "index.php?fc=module&module=cosmospay&controller=validation&cancel")        

diff --git a/views/templates/front/payment_return.tpl b/views/templates/front/payment_return.tpl
@@ -18,6 +18,7 @@
          {$orderSymbol}{$orderValue}
       </div>
    </div>
+
    <div class="cosmos-content">
       <p>Select your cryptocurrency:</p>
       <div class="box">     
@@ -167,14 +168,17 @@ console.log(exportCosmosConfig)
     var nonceSelectChain = ""
     var nonceDeleteOrder = ""
     var nonceSwitchMethod = ""
+    var nonceSwitchMethod = ""
+    var setDefault = "{$unserializeChains[0]}"
     startChecking( 
       order_id, 
       mainDomain, 
       memo, 
       isBlocked, 
       nonceSelectChain, 
       nonceDeleteOrder, 
-      nonceSwitchMethod 
+      nonceSwitchMethod,
+      setDefault
     );
 } 
 </script>

diff --git a/views/templates/hook/getContent.tpl b/views/templates/hook/getContent.tpl
@@ -38,7 +38,7 @@
 
         <br />
         <legend>Your receiving addresses</legend>
-        {foreach from=$configCosmos key=k item=v}      
+        {foreach from=$configCosmos key=k item=v} 
         {if $inputActive}
           {foreach from=$inputActive key=dbk item=dbv} 
             {if $dbk eq $v->name}
@@ -136,17 +136,15 @@
 import bech32 from "bech32";
 
 $(document).ready(function() {
-   $( 'input[name="checkChains[]"]' ).click(function () { 
-     if ($(this).is(':checked')) {
-       $("#addInput").append(
-          '<input type="hidden" name="input['+$(this).val()+']">' 
-       ); 
-       //$("#"+$(this).val()).show();
-     } else {
-       $("#"+$(this).val()).remove();
-       // $("#"+$(this).val()).hide();
-     }
-   }); 
+//    $( 'input[name="checkChains[]"]' ).click(function () { 
+//      if ($(this).is(':checked')) {
+//        $("#addInput").append(
+//           '<input type="hidden" name="input['+$(this).val()+']">' 
+//        ); 
+//      } else {
+//        $("#"+$(this).val()).remove();
+//      }
+//    }); 
  
 
   $.getJSON( "https://store-api.bitcanna.io", async function( result ) {
@@ -157,7 +155,7 @@ $(document).ready(function() {
         console.log($(this).val()) 
         try {
           let bech32Decode = bech32.decode($(this).val())
-          console.log(bech32Decode) 
+          //console.log(bech32Decode) 
           if (bech32Decode.prefix === element.coinLookup.addressPrefix) {
             $("#goodAddr_"+element.name).show();
             $("#badAddr_"+element.name).hide();    
@@ -171,7 +169,7 @@ $(document).ready(function() {
           }
 
         } catch (error) {
-          console.error(error);
+          // console.error(error);
           $("#goodAddr_"+element.name).hide();
           $("#badAddrPrefix_"+element.name).hide();
           $("#badAddr_"+element.name).show();