changes in sales by period report

app/controllers/sales_controller.rb

@@ -409,18 +409,27 @@ class SalesController < ApplicationController
 
       if params[:pointsale_id].present?
         @pointsale = Pointsale.find(params[:pointsale_id])
+        @incomes_in_period = @pointsale.cash_registers_moves.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
         @sales = @pointsale.sales.activas.where(date_sale: start_date..end_date).includes(:sales_details).order("id DESC")
       else
+        @incomes_in_period = CashRegistersMove.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
         @sales = Sale.activas.where(date_sale: start_date..end_date).includes(:sales_details).order("id DESC")
       end
 
-      @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)).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)
-
+      # @cash_sales_income = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 1).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
+      # @reserved_sales_income = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 2).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
+      # @credit_sales_income = CashRegistersMove.activos.where("sale_id IN (?)", @sales.where(saletype: 0).pluck(:id)).where(created_at: start_date..end_date).sum(:quantity)
+      @cash_sales_income = @incomes_in_period.where('sales.saletype = 1').sum(:quantity)
+      @reserved_sales_income = @incomes_in_period.where('sales.saletype = 2').sum(:quantity)
+      @credit_sales_income = @incomes_in_period.where('sales.saletype = 0').sum(:quantity)
+      @sales_income = @incomes_in_period.sum(:quantity)
+
+      @cash_sales_total = @sales.where(saletype: 1).sum(:total)
+      @reserved_sales_total = @sales.where(saletype: 2).sum(:total)
+      @credit_sales_total = @sales.where(saletype: 0).sum(:total)
+      @sales_total = @sales.sum(:total)
       format.js
     end
   end

app/views/sales/sales_per_month.js.erb

@@ -5,10 +5,15 @@ $('#sales_table').dataTable().fnClearTable();
   table.row.add(row).draw();
 <% end %>
 
-$('#sales_total').html(accounting.formatMoney('<%= @sales_total %>'));
 $('#prods_total').html('<%= @prods_total %>');
 $('#sales_quantity').html('<%= @sales_quantity %>');
 
+$('#cash_sales_income').html(accounting.formatMoney('<%= @cash_sales_income %>'));
+$('#reserved_sales_income').html(accounting.formatMoney('<%= @reserved_sales_income %>'));
+$('#credit_sales_income').html(accounting.formatMoney('<%= @credit_sales_income %>'));
+$('#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 %>'));

app/views/sales/sales_per_month_report.html.erb

@@ -83,47 +83,72 @@
                           <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>
                         </div>
 
-                        <div class="col-xs-4">
+                        <div class="col-xs-offset-1 col-xs-5">
                           <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
                             <div class="font-grey-mint font-sm">NUMERO DE VENTAS</div>
                             <div class="uppercase font-hg font-blue-sharp" id="sales_quantity">0</div>
                           </div>
                         </div>
-                        <div class="col-xs-4">
+                        <div class="col-xs-offset-1 col-xs-5">
                           <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
                             <div class="font-grey-mint font-sm">PRODUCTOS VENDIDOS</div>
                             <div class="uppercase font-hg font-blue-sharp" id="prods_total">0</div>
                           </div>
                         </div>
-                        <div class="col-xs-4">
-                          <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
-                            <div class="font-grey-mint font-sm">TOTAL DE INGRESOS</div>
-                            <div class="uppercase font-hg font-green" id="sales_total">$0.00</div>
-                          </div>
+                      </div>
+                    </div>
+
+                    <div class="row" style="margin-top:20px">
+                      <div class="col-md-3 col-sm-3 col-xs-6">
+                        <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
+                          <div class="font-grey-mint font-sm">Total vendido contado </div>
+                          <div class="uppercase font-hg font-blue-sharp" id="cash_sales_total"> $0.00</div>
+                        </div>
+                      </div>
+                      <div class="col-md-3 col-sm-3 col-xs-6">
+                        <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
+                          <div class="font-grey-mint font-sm">Total vendido apartados</div>
+                          <div class="uppercase font-hg font-blue-sharp" id="reserved_sales_total"> $0.00</div>
+                        </div>
+                      </div>
+                      <div class="col-md-3 col-sm-3 col-xs-6">
+                        <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
+                          <div class="font-grey-mint font-sm">Total vendido crédito </div>
+                          <div class="uppercase font-hg font-blue-sharp" id="credit_sales_total"> $0.00</div>
+                        </div>
+                      </div>
+                      <div class="col-xs-3">
+                        <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
+                          <div class="font-grey-mint font-sm">TOTAL VENDIDO</div>
+                          <div class="uppercase font-hg font-green" id="sales_total">$0.00</div>
                         </div>
                       </div>
                     </div>
                     <div class="row" style="margin-top:20px">
-                      <div class="col-xs-1"></div>
                       <div class="col-md-3 col-sm-3 col-xs-6">
                         <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
                           <div class="font-grey-mint font-sm">ingresos por ventas a contado </div>
-                          <div class="uppercase font-hg font-blue-sharp" id="cash_sales_total"> $0.00</div>
+                          <div class="uppercase font-hg font-blue-sharp" id="cash_sales_income"> $0.00</div>
                         </div>
                       </div>
                       <div class="col-md-3 col-sm-3 col-xs-6">
                         <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
                           <div class="font-grey-mint font-sm">ingresos por apartados</div>
-                          <div class="uppercase font-hg font-blue-sharp" id="reserved_sales_total"> $0.00</div>
+                          <div class="uppercase font-hg font-blue-sharp" id="reserved_sales_income"> $0.00</div>
                         </div>
                       </div>
                       <div class="col-md-3 col-sm-3 col-xs-6">
                         <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
                           <div class="font-grey-mint font-sm">ingresos por ventas a crédito </div>
-                          <div class="uppercase font-hg font-blue-sharp" id="credit_sales_total"> $0.00</div>
+                          <div class="uppercase font-hg font-blue-sharp" id="credit_sales_income"> $0.00</div>
+                        </div>
+                      </div>
+                      <div class="col-xs-3">
+                        <div class="text-center well" id="container_total_prods" style="margin-bottom: 0px">
+                          <div class="font-grey-mint font-sm">TOTAL DE INGRESOS</div>
+                          <div class="uppercase font-hg font-green" id="sales_income">$0.00</div>
                         </div>
                       </div>
-                      <div class="col-xs-1"></div>
                     </div>
                     <br>
                     <div class="row">