remove conflict data

2018-07-10 18:13:41 +06:30
parent bf0f76ebc7 441f37ba8a
commit 47b59cca59
23 changed files with 850 additions and 33 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -77,9 +77,11 @@ class Origami::PaymentsController < BaseOrigamiController
      item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale_items)
      discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale_items)

+      other_amount = SaleItem.calculate_other_charges(sale_items)
+
      printer = Printer::ReceiptPrinter.new(print_settings)

-      filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil)    
+      filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount)    

      result = { 
        :filepath => filename, 
@@ -216,9 +218,10 @@ class Origami::PaymentsController < BaseOrigamiController
          # Calculate Food and Beverage Total
          item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items)
          discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
+          other_amount = SaleItem.calculate_other_charges(sale_items)

          printer = Printer::ReceiptPrinter.new(print_settings)
-          filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data)
+          filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data,other_amount)

          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})

@@ -475,9 +478,10 @@ class Origami::PaymentsController < BaseOrigamiController
      # Calculate price_by_accounts
      item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items)
      discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
-      
+      other_amount = SaleItem.calculate_other_charges(saleObj.sale_items)
+
      printer = Printer::ReceiptPrinter.new(print_settings)
-      filename, receipt_no, cashier_printer = 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_detail, "Re-print",current_balance,card_data)
+      filename, receipt_no, cashier_printer = 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_detail, "Re-print",current_balance,card_data,other_amount)
      
      result = { 
        :status => true,
@@ -560,9 +564,11 @@ class Origami::PaymentsController < BaseOrigamiController
        item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items)
        discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)

+        other_amount = SaleItem.calculate_other_charges(saleObj.sale_items)
+
        printer = Printer::ReceiptPrinter.new(print_settings)

-        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_detail, "FOC",nil,nil)
+        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_detail, "FOC",nil,nil,other_amount)
        result = { 
              :status => true,
              :filepath => filename, 
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -101,7 +101,7 @@ class Origami::ShiftsController < BaseOrigamiController
        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)
+        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 )
      end
    end
    Employee.logout(session[:session_token])
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -124,9 +124,9 @@ class Origami::VoidController < BaseOrigamiController
        # Calculate Food and Beverage Total
        item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items)
        discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
-
+        other_amount = SaleItem.calculate_other_charges(sale.sale_items)
        printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount)   
        result = { 
              :filepath => filename, 
              :printer_model => print_settings.brand_name, 
--- a/app/controllers/origami/waste_spoile_controller.rb
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -105,9 +105,9 @@ class Origami::WasteSpoileController < BaseOrigamiController
        # Calculate Food and Beverage Total
        item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items)
        discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
-
+        other_amount = SaleItem.calculate_other_charges(sale.sale_items)
        printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil)   
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil,other_amount)   
        result = { 
              :filepath => filename, 
              :printer_model => print_settings.brand_name, 
--- a/app/controllers/reports/receipt_no_detail_controller.rb
+++ b/app/controllers/reports/receipt_no_detail_controller.rb
@@ -0,0 +1,71 @@
+class Reports::ReceiptNoDetailController < BaseReportController	  
+authorize_resource :class => false
+	def index
+		@payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"]]
+		@payment_method =  PaymentMethodSetting.all
+		from, to  = get_date_range_from_params
+
+		@shift_sale_range = ''
+
+	    @shift = ''
+	    if params[:shift_name].to_i != 0
+
+	      @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
+	      @shift_sale = ShiftSale.find(params[:shift_name])
+	      if to.blank?  
+	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',@shift_sale.shift_started_at)
+	      else
+	        if @shift_sale.shift_closed_at.blank?
+	          @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',@shift_sale.shift_started_at)
+	        else
+	          @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',@shift_sale.shift_started_at, @shift_sale.shift_closed_at)
+	        end
+	      end
+	    end
+
+	    payment_type = params[:payment_type]
+        @sale_data = Sale.get_shift_sales_by_receipt_no_detail(@shift_sale_range,@shift,from,to,payment_type) 
+
+        @from       = from
+        @to         = to
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
+        if @shift.present?
+	      @shift.each do |sh|
+	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+	        @shift_data = sh
+	      end
+	    end
+
+		respond_to do |format|
+	      format.html
+	      format.xls
+	    end
+	end
+
+	def show
+		from, to  = get_date_range_from_params
+
+	    @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
+		date_arr = Array.new
+		@sale_data.each do |sale|
+			local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+			local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+			opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+			closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+			shift_id = sale.id.nil? ? '-' : sale.id
+			str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+			date_arr.push(str)
+		end
+
+	    out = {:status => 'ok', :message => date_arr}
+	    
+	    respond_to do |format|
+	      format.json { render json: out }
+	    end
+	end
+	
+end
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -1,7 +1,8 @@
 class Reports::SaleitemController < BaseReportController
 		 authorize_resource :class => false
  def index
-      
+     
+    @account = Account.all
    from, to  = get_date_range_from_params

    shift_sale_range = ''
@@ -23,8 +24,9 @@ class Reports::SaleitemController < BaseReportController
      end
    end

+    account_type = params[:account_type]
    @type = params[:sale_type]
-    @sale_data, @other_charges,@product, @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,@type)
+    @sale_data, @other_charges,@product, @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,@type,account_type)

    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)