pull from master

This commit is contained in:
San Wai Lwin
2018-06-18 16:14:59 +06:30
parent 25a8381681
commit 234c00f105
27 changed files with 810 additions and 547 deletions

View File

@@ -991,8 +991,9 @@
});
$('#in_duties').on('click', function () {
var dining_id = "<%= @dining.id %>"
window.location.href = '/origami/assign_in_duty/'+ dining_id;
var dining_id = "<%= @dining.id %>";
var sale_id = "<%= @obj_sale.sale_id rescue "" %>";
window.location.href = '/origami/assign_in_duty/'+ sale_id;
});
$('#void').on('click', function () {