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

2018-03-13 14:53:07 +06:30
parent 0a9294ed60 a9afa4e317
commit a0c6c363fd
33 changed files with 1188 additions and 82 deletions
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -46,6 +46,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
              if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
                new_total    = Sale.get_rounding_adjustment(sale.grand_total)
                sale.rounding_adjustment = new_total-sale.grand_total
+                sale.update_attributes(grand_total: new_total,old_grand_total: sale.grand_total,rounding_adjustment:sale.rounding_adjustment)        
              end
            end
            #end rounding adjustment