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

2017-07-03 10:29:07 +06:30
parent 39ba5d5e86 15cbac995f
commit 6c3c863fce
16 changed files with 194 additions and 171 deletions
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -32,7 +32,7 @@
 <script>
 $('#close_cashier').on('click',function(){
  var amount = $('#closing_balance_amount').val();
-  var shift_id = "<%= @shift.id %>"
+  var shift_id = "<%= @shift.id rescue ""%>"
  $.ajax({type: "POST",
    url: "<%= origami_close_shift_path %>",
    data: "closing_balance="+ amount + "&shift_id="+ shift_id,