Pull from master

2018-06-11 13:18:18 +06:30
parent 019db9f5d1
commit 97f4a9df11
6 changed files with 163 additions and 29 deletions
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -37,7 +37,10 @@ class Origami::SalesController < BaseOrigamiController
             #  create sale item
             saleobj = Sale.find(sale_id)
             order.order_items.each do |orer_item|
-               saleobj.add_item (orer_item)
+                saleobj.add_item (orer_item)
+                if !orer_item.set_menu_items.nil?
+                  saleobj.add_sub_item(orer_item.set_menu_items)
+                end
             end

             # Re-compute for add