Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2018-05-04 18:10:14 +06:30
parent d0b14cf81b cb3711e84b
commit be9218dd79
7 changed files with 44 additions and 66 deletions
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -378,7 +378,7 @@
      </div>
    </div>
  </div>
-</div>
+  
 <p id="ref_no" class="hidden"></p>
 <p id="callback_url" class="hidden"></p>
 <p id="order_id" class="hidden"></p>
@@ -411,4 +411,6 @@

 <div id="notify_new_order"></div>
 <div id="notify_order_send_to_kitchen"></div>
-<div id="notify_order_ready_to_delivery"></div>
+<div id="notify_order_ready_to_delivery"></div>
+
+</div>
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -387,6 +387,6 @@ $('#re-print').click(function() {
    var sale_id = $('#sale_id').val();
    window.location.href = '/origami/'+ sale_id  + "/reprint"

-    return false;
+    // return false;
  });
 </script>