Przeglądaj źródła

bugfix with dates in sales report

Jose Miguel Ledon Nieblas 8 lat temu
rodzic
commit
65a9b55a0b

+ 3 - 3
app/controllers/sales_controller.rb

@@ -417,9 +417,9 @@ class SalesController < ApplicationController
       @sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
       @sales_quantity = @sales.size
       @prods_total = SalesDetail.where("sale_id IN (?)", @sales.pluck(:id)).sum(:quantity).round
-      @cash_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 1).pluck(:id)).sum(:quantity)
-      @reserved_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 2).pluck(:id)).sum(:quantity)
-      @credit_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 0).pluck(:id)).sum(:quantity)
+      @cash_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 1).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
+      @reserved_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 2).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
+      @credit_sales_total = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 0).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
 
       format.js
     end

+ 2 - 2
app/views/sales/sales_per_month_report.html.erb

@@ -169,8 +169,8 @@
     //buscar ventas por periodo de tiempo
     function findSalesByPeriod() {
       var pointsale = $('#pointsale').val();
-      var start = moment($("#start").val(), "DD-MM-YYYY").format('YYYY-MM-DD');
-      var end = moment($("#end").val(), "DD-MM-YYYY").format('YYYY-MM-DD');
+      var start = moment($("#start").val(), "DD-MM-YYYY").startOf('Day').format('YYYY-MM-DD H:mm:ss');
+      var end = moment($("#end").val(), "DD-MM-YYYY").endOf('Day').format('YYYY-MM-DD H:mm:ss');
 
       if ($("#start").val() && $("#end").val()) {
         App.blockUI({