Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/discounts_controller.rb

@@ -29,14 +29,19 @@ class Origami::DiscountsController < BaseOrigamiController
       # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;  
       # sale.save   
       if discount_items.length > 0
+        puts discount_items.to_json
+        puts "dddddddddddd"
+
         #save sale item for discount
         discount_items.each do |di|
           origin_sale_item = SaleItem.find(di["id"])
+          puts origin_sale_item.to_json
           sale_item = SaleItem.new
 
           sale_item.sale_id = sale_id
           sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
           sale_item.product_name = di["name"]
+          sale_item.item_instance_code = origin_sale_item.item_instance_code
           sale_item.product_alt_name = ""
           sale_item.remark = "Discount"
 

app/controllers/reports/saleitem_controller.rb

@@ -16,7 +16,8 @@ class Reports::SaleitemController < BaseReportController
       end
     end
     @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
-    
+    puts @sale_data.to_json
+    puts "SSSSSSSSSSS"
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}