Просмотр исходного кода

added the concept in cashout when products return

jose miguel 7 лет назад
Родитель
Сommit
ff8597396e

+ 2 - 0
app/controllers/cash_registers_moves_controller.rb

@@ -96,6 +96,8 @@ class CashRegistersMovesController < ApplicationController
         # calcular cambio cuando aplica.
         @cash_registers_move.calculate_quantities
         @cash_registers_move.move_type = :ingreso
+        @cash_registers_move.concept = :products_return
+        @cash_registers_move.sale_id = @cash_registers_move.products_return.sale_id
         @cash_registers_move.status = :inactive
 
         message = "movimiento de efectivo por devolución con folio #{@cash_registers_move.products_return.return_code}"

+ 2 - 0
app/helpers/cash_outs_helper.rb

@@ -15,6 +15,8 @@ module CashOutsHelper
       'ANTICIPO DE APARTADO'
     when "reserved_last_payment"
       'LIQUIDACIÓN DE APARTADO'
+    when "products_return"
+      'DIFERENCIA POR DEVOLUCIÓN'
     end
   end
 end

+ 4 - 0
app/views/cash_outs/_form.html.erb

@@ -138,6 +138,8 @@
                 <%= move.expense.expense_code %>
               <% when "credit_payment"%>
                 <%= move.credit_payment.id %>
+              <% when "products_return"%>
+                <%= move.products_return.sale.sale_code %>
             <% end %>
           </td>
           <td><%= move.open_cash_register.cash_register.name%></td>
@@ -160,6 +162,8 @@
                 ANTICIPO DE APARTADO
               <% when "reserved_last_payment" %>
                 LIQUIDACIÓN DE APARTADO
+              <% when "products_return" %>
+                DIFERENCIA POR DEVOLUCIÓN
             <% end %>
           </td>
           <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>

+ 1 - 1
app/views/cash_outs/show.html.erb

@@ -246,7 +246,7 @@
 										          <td><%= key + 1 %></td>
 										          <td>
 										            <% case move.concept %>
-          												<% when "sale",  "reserved_payment", "reserved_first_payment", "reserved_last_payment" %>
+          												<% when "sale",  "reserved_payment", "reserved_first_payment", "reserved_last_payment", "products_return" %>
 										                <%= move.sale.sale_code %>
 										              <% when "purchase"%>
 										                <%= move.purchase.purchase_code %>

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

@@ -127,19 +127,19 @@
                     <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">ingresos por ventas a contado </div>
+                          <div class="font-grey-mint font-sm">Ingresos por contado y devoluciones </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="font-grey-mint font-sm">Ingresos por apartados</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="font-grey-mint font-sm">Ingresos por ventas a crédito </div>
                           <div class="uppercase font-hg font-blue-sharp" id="credit_sales_income"> $0.00</div>
                         </div>
                       </div>