Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

2019-08-09 14:22:08 +06:30
parent 5e344dc4a6 78af4188d1
commit 67793b282e
14 changed files with 61 additions and 51 deletions
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -86,7 +86,7 @@ authorize_resource :class => false
                :body => { :orders =>  @orders,
                		   :order_items => @order_items,
                		   :sale_orders => @sale_orders,
-                		   :sale => @sales,
+                		   :sales => @sales,
                		   :sale_items => @sale_items,
                		   :sale_audits => @sale_audits,
                		   :sale_payments => @sale_payments,