Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

2017-08-23 17:37:47 +06:30
parent de769f3faf 784da2cf09
commit 44459ce4b5
43 changed files with 1424 additions and 830 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -572,6 +572,12 @@
        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
    });

+    $('#commissions').on('click', function () {
+        var dining_id = "<%= @dining.id %>"
+        var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/load_commissioners";
+    });
+
    $('#void').on('click', function () {
        var sure = confirm("Are you sure want to Void");
        if (sure == true) {