sale_items pdf

app/controllers/origami/shifts_controller.rb

@@ -11,6 +11,7 @@ class Origami::ShiftsController < BaseOrigamiController
     if !bank_integration[0].nil?
       @bank_integration = bank_integration[0][1]
     end
+
   end
 
   def new
@@ -83,6 +84,11 @@ class Origami::ShiftsController < BaseOrigamiController
         shop_details = shop_detail
         #get tax
         shift_obj      = ShiftSale.where('id =?',@shift.id)
+        sale_items = ''
+        @lookup = Lookup.shift_sale_items_lookup_value
+        if @lookup.to_i == 1
+          @sale_items    = Sale.get_shift_sale_items(@shift.id)
+        end
         @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
         @total_waste   = Sale.get_total_waste(shift_id).sum(:grand_total)
         @total_spoile  = Sale.get_total_spoile(shift_id).sum(:grand_total)
@@ -98,11 +104,14 @@ class Origami::ShiftsController < BaseOrigamiController
         @total_other_charges        = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount
         @total_credit_payments      = ShiftSale.get_shift_sales_with_credit_payment(shift_id).total_credit_payments
 
-        # get printer info
-        print_settings = PrintSetting.find_by_unique_code(unique_code)
-        printer = Printer::CashierStationPrinter.new(print_settings)
-        
-        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
+        # close_cashier = Lookup.is_print_close_cashier
+        # if close_cashier
+          # get printer info
+          print_settings = PrintSetting.find_by_unique_code(unique_code)
+          printer = Printer::CashierStationPrinter.new(print_settings)
+
+          printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments)
+        # end
       end
     end
     Employee.logout(session[:session_token])

app/controllers/print_settings_controller.rb

@@ -11,6 +11,7 @@ class PrintSettingsController < ApplicationController
   # GET /print_settings/1
   # GET /print_settings/1.json
   def show
+    @lookup = Lookup.shift_sale_items_lookup_value
   end
 
   # GET /print_settings/new
@@ -21,6 +22,7 @@ class PrintSettingsController < ApplicationController
 
   # GET /print_settings/1/edit
   def edit
+    @lookup = Lookup.shift_sale_items_lookup_value
     @server_mode = ENV["SERVER_MODE"]
   end
 
@@ -45,6 +47,10 @@ class PrintSettingsController < ApplicationController
   def update
     respond_to do |format|
       if @print_setting.update(print_setting_params)
+        if @print_setting.unique_code == 'CloseCashierPdf'
+          Lookup.save_shift_sale_items_settings(params[:shift_sale_items])
+        end
+
         format.html { redirect_to @print_setting, notice: 'Print setting was successfully updated.' }
         format.json { render :show, status: :ok, location: @print_setting }
       else

app/controllers/reports/saleitem_controller.rb

@@ -31,10 +31,9 @@ class Reports::SaleitemController < BaseReportController
     @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
 
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
-
-
     @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
 
+
     @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
     @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}