瀏覽代碼

Filter sale income when filtering sales by category, in sales per month report

Jacqueline Maldonado 7 年之前
父節點
當前提交
9e7bd279fe
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 4 1
      app/controllers/sales_controller.rb
  2. 2 2
      app/views/sales/sales_per_month.js.erb

+ 4 - 1
app/controllers/sales_controller.rb

@@ -395,7 +395,10 @@ class SalesController < ApplicationController
       @sales = Sale.joins(:products, products: :categories).includes(:user, :seller).activas.where(created_at: start_date..end_date).order("id DESC")
     end
 
-    @sales = @sales.where(categories: { id: ids }) if category.present?
+    if category.present?
+      @sales = @sales.where(categories: { id: ids })
+      @incomes_in_period = @incomes_in_period.where(sale_id: @sales.ids)
+    end
 
     @sales_quantity = @sales.size
     @prods_total = SalesDetail.where("sale_id IN (?)", @sales.pluck(:id)).sum(:quantity).round

+ 2 - 2
app/views/sales/sales_per_month.js.erb

@@ -1,7 +1,7 @@
 var table = $('#sales_table').DataTable();
 $('#sales_table').dataTable().fnClearTable();
 <% @sales.each_with_index do |sale, key| %>
-  var row = $('<%= j render partial: "sale_for_report", locals: {sale: sale} %>');
+  var row = $('<%= j render partial: "sale_for_report", locals: { sale: sale } %>');
   table.row.add(row).draw();
 <% end %>
 
@@ -16,4 +16,4 @@ $('#sales_income').html(accounting.formatMoney('<%= @sales_income %>'));
 $('#cash_sales_total').html(accounting.formatMoney('<%= @cash_sales_total %>'));
 $('#reserved_sales_total').html(accounting.formatMoney('<%= @reserved_sales_total %>'));
 $('#credit_sales_total').html(accounting.formatMoney('<%= @credit_sales_total %>'));
-$('#sales_total').html(accounting.formatMoney('<%= @sales_total %>'));
+$('#sales_total').html(accounting.formatMoney('<%= @sales_total %>'));