Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -601,10 +601,11 @@ var customer_name = "<%= @customer.name %>";
    $("#back").on('click', function() {
      localStorage.removeItem('cash');
      customer_display_view(null,"reload");
+      var sale_id = $('#sale_id').text();
      if (cashier_type=="cashier") {
        window.location.href = '/origami/table/'+ dining_id;
      }else{
-        window.location.href = '/origami/quick_service';
+        window.location.href = '/origami/quick_service/pending_order/'+sale_id;
      }  
    });