Add multiple photo upload

app/controllers/origami/home_controller.rb

@@ -74,16 +74,6 @@ class Origami::HomeController < BaseOrigamiController
                 @date = order.created_at
                 @booking= booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.nil?
-                    instance_item_sets = JSON.parse(item.set_menu_items)
-                    arr_instance_item_sets = Array.new
-                    instance_item_sets.each do |instance_item|
-                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-                      arr_instance_item_sets.push(item_instance_name)
-                      item.price = item.price.to_f + instance_item["price"].to_f
-                    end
-                    item.set_menu_items = arr_instance_item_sets
-                  end
                   @order_items.push(item)
                   # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
                   # if !assigned_order_items.nil?

app/controllers/origami/payments_controller.rb

@@ -104,7 +104,9 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
       #end rounding adjustment
-
+      puts "sale"
+      puts saleObj.to_json
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
@@ -158,6 +160,20 @@ class Origami::PaymentsController < BaseOrigamiController
           end
         end
         
+        #orders print out
+        if params[:type] == "quick_service"
+          booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
+          booking.booking_orders.each do |order|
+            Order.pay_process_order_queue(order.order_id,table_id)
+          end
+        end
+
         #for card sale data
         card_data = Array.new
         card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)
@@ -181,19 +197,6 @@ class Origami::PaymentsController < BaseOrigamiController
         filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
 
         render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
-
-        if params[:type] == "quick_service"
-          booking = Booking.find_by_sale_id(sale_id)
-          if booking.dining_facility_id.to_i>0
-            table_id = booking.dining_facility_id
-          else
-            table_id = 0
-          end
-          
-          booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,table_id)
-        end
-    end
       end
     end    
   end

app/controllers/origami/rooms_controller.rb

@@ -68,16 +68,6 @@ class Origami::RoomsController < BaseOrigamiController
                 @date = order.created_at
                 @booking = booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.nil?
-                    instance_item_sets = JSON.parse(item.set_menu_items)
-                    arr_instance_item_sets = Array.new
-                    instance_item_sets.each do |instance_item|
-                      item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-                      arr_instance_item_sets.push(item_instance_name)
-                      item.price = item.price.to_f + instance_item["price"].to_f
-                    end
-                    item.set_menu_items = arr_instance_item_sets
-                  end
                   @order_items.push(item)
                   # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
                   # if !assigned_order_items.nil?

app/controllers/origami/shifts_controller.rb

@@ -3,6 +3,7 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
+    @type = params[:type]
     @shift = ShiftSale.current_open_shift(current_user.id)
     #for bank integration
     bank_integration = Lookup.collection_of('bank_integration')

app/controllers/settings/menus_controller.rb

@@ -6,6 +6,10 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus.json
   def index
     @settings_menus = Menu.all.page(params[:page]).per(10)
+    respond_to do |format|
+      format.html
+      format.csv { send_data Menu.to_csv }
+    end
   end
 
   # GET /settings/menus/1

app/controllers/settings/shops_controller.rb

@@ -51,7 +51,11 @@ class Settings::ShopsController < ApplicationController
       if @settings_shop.update(shop_params)
         if params[:display_images].present?
           params[:display_images]['image'].each do |a|
-            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => a)
+            
+            aa = a.read
+            base64_encoded = Base64.encode64(aa)
+            byebug
+            @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => base64_encoded)
           end
         end
         format.html { redirect_to settings_shops_url, notice: 'Shop was successfully updated.' }