Bläddra i källkod

manager can open cash register, now we can close cash register with 0

Jose Miguel Ledon Nieblas 8 år sedan
förälder
incheckning
481a03f75e

+ 2 - 0
app/controllers/cash_outs_controller.rb

@@ -68,6 +68,8 @@ class CashOutsController < ApplicationController
       message = "Corte de caja de #{@cash_out.open_cash_register.cash_register.name} realizado correctamente"
       @cash_out.audit_comment = message
       if @cash_out.save
+        # eliminar el id del open cash de la sesion
+        session.delete(:open_cash_register_id)
         open_cash_register.update_attributes(status: 'closed', final_cash: final_cash)
         format.js { flash[:success] = message }
       else

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

@@ -264,12 +264,12 @@
         var physicalCash = parseFloat($('#cash_out_physical_cash').val());
         var receivedCash = parseFloat($('#cash_out_received_cash').val());
 
-        if(physicalCash && receivedCash) {
+        if(!isNaN(physicalCash) && !isNaN(receivedCash)) {
           var cashFund = physicalCash - receivedCash;
           $('#cash_out_cash_fund').val(cashFund);
           $('#cash_fund_display').val(cashFund);
 
-          if( receivedCash > physicalCash) {
+          if(receivedCash > physicalCash) {
             toastr["error"]("El retiro de efectivo no puede ser mayor al efectivo disponible en caja.");
             $('#submit_cash_out').addClass('disabled');
             $('#cash_out_cash_fund').val('');

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

@@ -46,8 +46,10 @@
                    <div class="actions">
                      <% if current_user.usertype == "G" %>
                         <% if can? :create, CashOut %>
-                        <%= link_to get_open_cash_registers_path, remote: true, data: { toggle: "modal", target: "#get_open_cash_register" }, :class=>"btn bold green pull-right", :title=>"Realizar corte de caja"  do %> Realizar corte de caja <i class="fa fa-plus"></i>
-                        <% end %>
+                          <%= link_to new_open_cash_register_path, :remote => true, :class => 'btn btn bold green margin-top pull-right', :title => "Abrir caja registradora" do %> Abrir caja <i class="fa fa-plus"></i>
+                          <% end %> <br>
+                          <%= link_to get_open_cash_registers_path, remote: true, data: { toggle: "modal", target: "#get_open_cash_register" }, :class=>"btn bold green pull-right", :title=>"Realizar corte de caja", :style=> "margin-top:10px"  do %> Realizar corte de caja <i class="fa fa-plus"></i>
+                          <% end %>
                         <% end %>
                      <% end %>
                      <% if current_user.usertype == "A" %>