Browse Source

another test adding 1 day to query report

jose miguel 7 years ago
parent
commit
d6289fb05f

+ 2 - 2
app/controllers/cash_outs_controller.rb

@@ -122,8 +122,8 @@ class CashOutsController < ApplicationController
 
   def find_cash_outs_by_date
     respond_to do |format|
-      start_date = DateTime.parse(params[:begin_date])
-      end_date = DateTime.parse(params[:end_date])
+      start_date = DateTime.parse(params[:start_date]).in_time_zone(Time.zone).beginning_of_day + 1.days
+      end_date = DateTime.parse(params[:end_date]).in_time_zone(Time.zone).end_of_day + 1.days
       @cash_outs = Pointsale.find(params[:pointsale_id]).cash_outs.includes(:open_cash_register, :user, :received_by).where(created_at: start_date..end_date).order(" id DESC ")
       format.js
     end

+ 2 - 2
app/controllers/sales_controller.rb

@@ -403,8 +403,8 @@ class SalesController < ApplicationController
     respond_to do |format|
       # start_date = DateTime.parse(params[:start_date])
       # end_date = DateTime.parse(params[:end_date])
-      start_date = DateTime.parse(params[:start_date]).in_time_zone(Time.zone).beginning_of_day
-      end_date = DateTime.parse(params[:end_date]).in_time_zone(Time.zone).end_of_day
+      start_date = DateTime.parse(params[:start_date]).in_time_zone(Time.zone).beginning_of_day + 1.days
+      end_date = DateTime.parse(params[:end_date]).in_time_zone(Time.zone).end_of_day + 1.days
       @cash_sales_total = 0
       @reserved_sales_total = 0
       @credit_sales_total = 0

+ 2 - 2
app/views/cash_outs/index.html.erb

@@ -177,8 +177,8 @@
   });
 
   function cashOutByPointsaleDate() {
-    var start = moment($("#begin_date").data("date"), "DD-MM-YYYY").utc().format('YYYY-MM-DD HH:mm:ss');
-    var end = moment($("#end_date").data("date"), "DD-MM-YYYY").utcOffset("+360").format('YYYY-MM-DD HH:mm:ss');
+    var start = moment($("#begin_date").data("date"), "DD-MM-YYYY").format('YYYY-MM-DD');
+    var end = moment($("#end_date").data("date"), "DD-MM-YYYY").format('YYYY-MM-DD');
     var pointsale = $('#pointsale').val();
     App.blockUI({
          target: $("#cash_outs_table"),