diff --git a/js/app.js b/js/app.js
index 2bd29df2..33cc9720 100755
--- a/js/app.js
+++ b/js/app.js
@@ -81,6 +81,22 @@ function CheckoutController($scope, $interval, Order, $timeout, Url) {
     function check_blockonomics_order() {
         $scope.spinner = true;
         if (typeof $scope.order_id != 'undefined') {
+            Order.get({
+                "get_order": 63, // Replace with another woocommerce order id
+                "crypto": $scope.crypto.code
+            }, function(data) {
+                $scope.spinner = false;
+                if(data.address !== undefined){
+                    $scope.order = data;
+                    // show the checkout page
+                    proccess_order_data();
+                    $scope.checkout_panel  = true;
+                }else if($scope.crypto.code === 'btc'){
+                    $scope.address_error_btc = true;
+                }else if($scope.crypto.code === 'bch'){
+                    $scope.address_error_bch = true;
+                }
+            });
             //Fetch the order using order_id
             Order.get({
                 "get_order": $scope.order_id,
diff --git a/php/Blockonomics.php b/php/Blockonomics.php
index 4d9f55c4..d922d6d5 100755
--- a/php/Blockonomics.php
+++ b/php/Blockonomics.php
@@ -477,9 +477,11 @@ public function get_order_by_id_and_crypto($orders, $order_id, $crypto){
     // Updates an order in blockonomics_orders
     // Always fetches latest orders first to ensure data integrity
     public function update_order($order){
+        error_log('blockonomics_order_'.$order['order_id'].'_started');
         $orders = get_option('blockonomics_orders');
         $orders[$order['order_id']][$order['address']] = $order;
         update_option('blockonomics_orders', $orders);
+        error_log('blockonomics_order_'.$order['order_id'].'_ended');
     }
 
     // Check and update the crypto order or create a new order