From 77103d07807384385dc734268ac7f9ebfeb1e1cc Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 4 Jun 2019 09:39:30 +0630 Subject: [PATCH] SaleItemsPdf updated --- .../reports/saleitem_controller.rb | 2 -- app/models/printer/cashier_station_printer.rb | 4 ++-- app/models/sale.rb | 3 ++- dump.rdb | Bin 1343 -> 1304 bytes 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index cc44be48..5beb919e 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -140,8 +140,6 @@ class Reports::SaleitemController < BaseReportController printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) end - - respond_to do |format| format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'} format diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index d5ac2e73..a98ed730 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -84,11 +84,11 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges) filename = "tmp/reports_sale_items.pdf" - if print_settings.unique_code == "CloseCashierPdf" + if print_settings.unique_code == "SaleItemsPdf" pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges, nil, nil, nil) puts 'Printing!!!!' end - if print_settings.unique_code == "CloseCashierStarPdf" + if print_settings.unique_code == "SaleItemsStarPdf" pdf = SaleItemsStarPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges, nil, nil, nil) puts 'PrintingStar!!!!' end diff --git a/app/models/sale.rb b/app/models/sale.rb index 81322e77..be7989db 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1016,7 +1016,8 @@ def self.get_item_query(type) query = query.joins(" JOIN accounts acc ON acc.id = i.account_id") query = query.where("#{sale_type}") query = query.group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price") - .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc") + .order("acc.title desc, i.account_id desc, SUM(i.qty) desc, i.menu_category_code desc, i.unit_price asc") + # query = query.order("SUM(i.qty) desc") end def self.get_other_charges() diff --git a/dump.rdb b/dump.rdb index 31fb9928329e5bcc7ff324e7e7ab3adfe6970fc9..00f10dc5b3043bafa20482f470f1183801e5e817 100644 GIT binary patch delta 128 zcmV-`0Du3#3YZFzF(}Ij^<4T0b#rB8Ep26O!e9Um0QwAJZ)PoUa%Ev{Vr*r=0R8~` zAPtj10v3^PMFd(MD;<%zI1M&3G&3_UGB-0hFgY`^{apc*zylYPm;#9i`3|7dj{yJx ilYs&hlRX0p1o;l2(~}PZ7_(yo)By-fZkLJpk$}m89WA2( delta 139 zcmV;60CfMD3cm`FF(`uc^j!J~b#rB8Ep26O!k`)&0QwAJZ)PoUa%Ev{Vr*r=0R8~` zAq|s20v3^PMFe&9+Z>U&I1M#7GBh%fn=Cdn