|
|
@@ -1,6 +1,6 @@
|
|
|
<%= form_for(@cash_out, :remote => true, :html => {:class=>"form-horizontal", :id=> "cash_out_form"}) do |f| %>
|
|
|
<div class="portlet-body form">
|
|
|
- <div id="error_explanation"></div>
|
|
|
+ <div class="alert alert-danger hidden" id="error_explanation"></div>
|
|
|
<div class="col-md-12">
|
|
|
<%= hidden_field_tag 'open_cash_register_id', @opened_cash_register.id %>
|
|
|
<%= hidden_field_tag 'cash_payment_id', @cash_payment_method_id %>
|
|
|
@@ -41,7 +41,7 @@
|
|
|
<span class="input-group-addon"> $ </span>
|
|
|
<%= f.text_field :physical_cash, {:class=>"form-control mask_decimal"} %>
|
|
|
</div>
|
|
|
- <span class="help-block">Es el dinero que se tiene fisicamente en caja. </span>
|
|
|
+ <span class="help-block">Es el dinero que se tiene físicamente en caja. </span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="form-group credit_limits">
|
|
|
@@ -232,7 +232,7 @@
|
|
|
<div style="margin-top: 30px">
|
|
|
<div class="row">
|
|
|
<div class="col-md-9">
|
|
|
- <button type="button" class="btn green disabled" onclick="addCashOut()" id="submit_cash_out">Guardar</button>
|
|
|
+ <button type="button" class="btn green" onclick="addCashOut()" disabled id="submit_cash_out">Guardar</button>
|
|
|
<%= link_to 'Cancelar', root_path, {:class=>"btn default"} %>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -264,41 +264,35 @@
|
|
|
});
|
|
|
|
|
|
function addCashOut() {
|
|
|
- if ( !$('#submit_cash_out').hasClass('disabled') ) {
|
|
|
- if ($('#cash_out_received_by_id').val()) {
|
|
|
- $('#submit_cash_out').prop('disabled', true);
|
|
|
- $('#cash_out_form').submit();
|
|
|
- } else {
|
|
|
- toastr["error"]("Seleccione quien va a recibir el corte de caja.");
|
|
|
- }
|
|
|
+ if($("#cash_out_received_by_id option:selected").val() && $("#cash_out_received_cash").val()) {
|
|
|
+ $("#cash_out_form").submit();
|
|
|
+ } else {
|
|
|
+ toastr["error"]("Faltan datos del formulario");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
function receivedAndFundCash() {
|
|
|
- clearTimeout(timeout);
|
|
|
- timeout = setTimeout(function () {
|
|
|
- var physicalCash = parseFloat($('#cash_out_physical_cash').val());
|
|
|
- var receivedCash = parseFloat($('#cash_out_received_cash').val());
|
|
|
+ clearTimeout(timeout);
|
|
|
+ timeout = setTimeout(function () {
|
|
|
+ var physicalCash = parseFloat($('#cash_out_physical_cash').val());
|
|
|
+ var receivedCash = parseFloat($('#cash_out_received_cash').val());
|
|
|
|
|
|
- if(!isNaN(physicalCash) && !isNaN(receivedCash)) {
|
|
|
- var cashFund = physicalCash - receivedCash;
|
|
|
- $('#cash_out_cash_fund').val(cashFund);
|
|
|
- $('#cash_fund_display').val(cashFund);
|
|
|
+ if(!isNaN(physicalCash) && !isNaN(receivedCash)) {
|
|
|
+ var cashFund = physicalCash - receivedCash;
|
|
|
+ $('#cash_out_cash_fund').val(cashFund);
|
|
|
+ $('#cash_fund_display').val(cashFund);
|
|
|
|
|
|
- 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('');
|
|
|
- $('#cash_fund_display').val('');
|
|
|
- } else {
|
|
|
- $('#submit_cash_out').removeClass('disabled');
|
|
|
- }
|
|
|
- } else {
|
|
|
+ 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('');
|
|
|
+ $('#cash_fund_display').val('');
|
|
|
+ } else {
|
|
|
+ $('#submit_cash_out').attr('disabled', false);
|
|
|
}
|
|
|
- }, 300);
|
|
|
+ } else {
|
|
|
+ $('#submit_cash_out').attr('disabled', true);
|
|
|
+ }
|
|
|
+ }, 300);
|
|
|
}
|
|
|
</script>
|
|
|
-
|
|
|
-
|
|
|
-
|