Merge pull request #35 from danstaver/hot-fixes

Hot fixes
bitpay · Aug 12, 2021 · 750fd5c · 750fd5c
2 parents 5095660 + c91b57c
commit 750fd5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/Bitpay/BPCheckout/view/frontend/templates/index.phtml b/code/Bitpay/BPCheckout/view/frontend/templates/index.phtml
@@ -42,7 +42,7 @@ if($m==1):
             deleteCookie('invoicedata')
             deleteCookie('modal')
 
-            window.location.replace(window.location.origin+"/rest/V1/bitpay-bpcheckout/close?orderID="+$order_id);
+            window.location.replace("<?= $configValue ?>"+"rest/V1/bitpay-bpcheckout/close?orderID="+$order_id);
 
         } //endif
 

diff --git a/code/Bitpay/BPCheckout/view/frontend/web/js/bitpay/config.js b/code/Bitpay/BPCheckout/view/frontend/web/js/bitpay/config.js
@@ -19,7 +19,7 @@ if (window.location.pathname == "/checkout/") {
     //try and load info from cookie
     setTimeout(function () {
         var $checkC = getCookie("buyer_first_name")
-        if(typeof $checkC != undefined){
+        if(typeof $checkC != undefined && $checkC != ""){
         jQuery('input[name="firstname"]').val(getCookie("buyer_first_name").replace(/\+/g, ' '))
         jQuery('input[name="lastname"]').val(getCookie("buyer_last_name").replace(/\+/g, ' '))
         jQuery('input[name="street[0]"]').val(getCookie("buyer_street").replace(/\+/g, ' '))