Selaa lähdekoodia

testing dates in report

jose miguel 7 vuotta sitten
vanhempi
commit
35b83f4e0e

+ 4 - 2
app/controllers/sales_controller.rb

@@ -401,8 +401,10 @@ class SalesController < ApplicationController
 
   def sales_per_month
     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])
+      # 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
       @cash_sales_total = 0
       @reserved_sales_total = 0
       @credit_sales_total = 0

+ 7 - 6
app/views/sales/sales_per_month_report.html.erb

@@ -8,7 +8,7 @@
         <div class="container-fluid">
           <!-- BEGIN PAGE TITLE -->
           <div class="page-title">
-            <h1>Reporte ventas por mes </h1>
+            <h1>Reporte ventas e ingresos por mes </h1>
           </div>
           <!-- END PAGE TITLE -->
         </div>
@@ -58,7 +58,7 @@
                         </div>
                       </div>
                       <div class="col-md-3" style="margin-top: 20px">
-                        <button class="btn green bold  btn-block" onclick="findSalesByPeriod()" style="margin:0px">Buscar <i class="m-icon-swapright m-icon-white"></i> </button>
+                        <button class="btn green bold  btn-block" onclick="findSalesByPeriod()" style="margin:0px">Filtrar <i class="m-icon-swapright m-icon-white"></i> </button>
                       </div>
                     </div>
                   </div>
@@ -72,7 +72,7 @@
               <div class="portlet light">
                 <div class="portlet-title">
                   <div class="caption">
-                    <span class="caption-subject font-blue-dark bold uppercase">Ventas</span>
+                    <span class="caption-subject font-blue-dark bold uppercase">Ventas e ingresos</span>
                   </div>
                 </div>
                 <div class="portlet-body form" id="sales_content">
@@ -80,7 +80,7 @@
                     <div class="row">
                       <div class="col-md-12">
                         <div class="note note-success hidden" id="note_info">
-                          <h4 class="block">Detalle de ventas del periodo: <strong><span id="start_date_display"></span></strong> al <strong><span id="end_date_display"></span></strong> en <strong><span id="pointsale_display"></span></strong></h4>
+                          <h4 class="block">Detalle de ventas e ingresos del periodo: <strong><span id="start_date_display"></span></strong> al <strong><span id="end_date_display"></span></strong> en <strong><span id="pointsale_display"></span></strong></h4>
                         </div>
 
                         <div class="col-xs-offset-1 col-xs-5">
@@ -153,6 +153,7 @@
                     <br>
                     <div class="row">
                       <div class="col-md-12">
+                        <h4 class="form-section">Desglose de ventas del periodo</h4>
                         <table class="table table-striped table-bordered table-hover tableadvanced" id="sales_table">
                           <thead>
                             <tr>
@@ -194,8 +195,8 @@
     //buscar ventas por periodo de tiempo
     function findSalesByPeriod() {
       var pointsale = $('#pointsale').val();
-      var start = moment($("#start").val(), "DD-MM-YYYY").utc().format('YYYY-MM-DD HH:mm:ss');
-      var end = moment($("#end").val(), "DD-MM-YYYY").utcOffset("+360").format('YYYY-MM-DD HH:mm:ss');
+      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');