Pull from master

2018-03-15 13:48:52 +06:30
parent 96f8640df7
commit 1188f6e8e9
29 changed files with 242 additions and 97 deletions
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -203,11 +203,12 @@ $(document).ready(function(){
          url: ajax_url,
          // data: 'order_id='+ order_id,
          success: function (result) {
+            console.log(result)
              if (!result.status) {
                swal("Information!", result.error_message);
              }
              else {              
-                location.reload();
+                window.location.href = '../pending_order/'+ result.data;
              }
          }
      });