From e4a4c7aba426d481e857a7ddba97ebd3e21b1c60 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 8 Dec 2017 16:07:10 +0630 Subject: [PATCH] update receipt no report --- .../reports/receipt_no_controller.rb | 1 - app/models/sale.rb | 6 +- app/views/origami/addorders/detail.html.erb | 59 ++++++++++--------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 9564bfe1..2bd5e813 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -21,7 +21,6 @@ authorize_resource :class => false @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @tax_profiles = TaxProfile.order('order_by asc') - @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index 4b60cc94..fbd22da2 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -764,23 +764,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty query = Sale.all if shift.present? - query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - elsif shift_sale_range.present? - query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") - else - query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to) .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .group("sales.sale_id") end + return query end def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 315cb99f..9021ecb5 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -7,36 +7,41 @@
    - <% - @menu.each do |menu| - if menu.menu_category_id.nil? - %> - - -
  • - - <%= menu.name%> -
    • - <% - end - - # Sub-Category - if !menu.menu_category_id.nil? - %> - - <% - end - end - %> + <% @menu.each do |menu| %> + <% if menu.menu_category_id.nil?%> +
  • + + <%= menu.name%> +
    • + <% end%> + + <% if !menu.menu_category_id.nil? %> + + <% end%> + <%end %> +
  • Products
    • + +