Explorar o código

bug on commission, was taking all sales instead of actives

jose miguel %!s(int64=9) %!d(string=hai) anos
pai
achega
812c6d62d3

+ 1 - 1
app/controllers/commissions_controller.rb

@@ -99,7 +99,7 @@ class CommissionsController < ApplicationController
     initial_date = DateTime.parse(params[:initial_date])
     final_date = DateTime.parse(params[:final_date])
 
-    sales = Pointsale.find(params[:pointsale_id]).sales.where(date_sale: initial_date..final_date).pluck(:id)
+    sales = Pointsale.find(params[:pointsale_id]).sales.activas.where(date_sale: initial_date..final_date).pluck(:id)
     commissions_paid = SalesSellercommission.where('sale_id IN (?)', sales).pluck(:sale_id)
 
     to_pay = sales - commissions_paid

+ 1 - 1
app/views/commissions/index.html.erb

@@ -46,7 +46,7 @@
                       <div class="actions">
 
                         <% if can? :create, Commission %>
-                          <%= link_to sellers_for_commissions_path, :remote => true, :class=>"btn bold green pull-right filtros" do %> Generar pago de comisión <i class="fa fa-plus"></i>
+                          <%= link_to sellers_for_commissions_path, :remote => true, :class=>"btn bold green pull-right" do %> Generar pago de comisión <i class="fa fa-plus"></i>
                           <% end %>
                         <% end %>
                       </div>