|
@@ -1,9 +1,9 @@
|
|
|
<%= form_for(@cash_registers_move, :remote => true, :html => {:class=>"form-horizontal", :id=> "cash_register_move_form"}) do |f| %>
|
|
<%= form_for(@cash_registers_move, :remote => true, :html => {:class=>"form-horizontal", :id=> "cash_register_move_form"}) do |f| %>
|
|
|
<%= f.hidden_field(:open_cash_register_id, :value => @sale.open_cash_register_id) %>
|
|
<%= f.hidden_field(:open_cash_register_id, :value => @sale.open_cash_register_id) %>
|
|
|
<%= f.hidden_field(:sale_id, :value => @sale.id) %>
|
|
<%= f.hidden_field(:sale_id, :value => @sale.id) %>
|
|
|
- <%= hidden_field_tag :reserve_sale_percent, @min_quantity_reserve %>
|
|
|
|
|
|
|
+ <%= hidden_field_tag :reserve_sale_percent, @min_quantity_reserve %>
|
|
|
<div class="portlet-body form">
|
|
<div class="portlet-body form">
|
|
|
- <div class="alert alert-danger hidden" id="error_explanation_move"></div>
|
|
|
|
|
|
|
+ <div class="alert alert-danger hidden" id="error_explanation_move"></div>
|
|
|
<div class="row">
|
|
<div class="row">
|
|
|
<!-- div para mostrar total -->
|
|
<!-- div para mostrar total -->
|
|
|
<div class="col-md-12">
|
|
<div class="col-md-12">
|
|
@@ -13,36 +13,36 @@
|
|
|
<%= hidden_field_tag 'sale_total', @sale.total %>
|
|
<%= hidden_field_tag 'sale_total', @sale.total %>
|
|
|
<div class="col-md-8 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
<div class="col-md-8 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
|
<h3 class="pull-right"><%= number_to_currency(@sale.total, precision: 2) %></h3>
|
|
<h3 class="pull-right"><%= number_to_currency(@sale.total, precision: 2) %></h3>
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
<div class="col-md-12">
|
|
<div class="col-md-12">
|
|
|
<div class="col-md-6" style="padding-left:0px"><h4 class="block">Cantidad mínima de anticipo:</h4></div>
|
|
<div class="col-md-6" style="padding-left:0px"><h4 class="block">Cantidad mínima de anticipo:</h4></div>
|
|
|
<div class="col-md-6 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
<div class="col-md-6 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
|
<h4 class="pull-right"><%= number_to_currency(@min_quantity_reserve, precision: 2) %></h4>
|
|
<h4 class="pull-right"><%= number_to_currency(@min_quantity_reserve, precision: 2) %></h4>
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- detalles y folio del pago -->
|
|
<!-- detalles y folio del pago -->
|
|
|
<div class="col-md-6">
|
|
<div class="col-md-6">
|
|
|
<span>Registrar detalle del anticipo</span> <br/>
|
|
<span>Registrar detalle del anticipo</span> <br/>
|
|
|
- <span># <%= @sale.sale_code %></span>
|
|
|
|
|
- <%= f.hidden_field(:ticket, :value => @sale.sale_code) %>
|
|
|
|
|
|
|
+ <span># <%= @sale.sale_code %></span>
|
|
|
|
|
+ <%= f.hidden_field(:ticket, :value => @sale.sale_code) %>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- div fecha -->
|
|
<!-- div fecha -->
|
|
|
<div class="col-md-6">
|
|
<div class="col-md-6">
|
|
|
<div class="col-md-6 pull-right" style="padding-left:0px;padding-right:0px;">
|
|
<div class="col-md-6 pull-right" style="padding-left:0px;padding-right:0px;">
|
|
|
- <div class='input-group date' id='datetimepicker2'>
|
|
|
|
|
|
|
+ <div class='input-group date' id='datetimepicker2'>
|
|
|
<input type='text' class="form-control" disabled/>
|
|
<input type='text' class="form-control" disabled/>
|
|
|
<span class="input-group-addon">
|
|
<span class="input-group-addon">
|
|
|
<span class="glyphicon glyphicon-calendar"></span>
|
|
<span class="glyphicon glyphicon-calendar"></span>
|
|
|
- </span>
|
|
|
|
|
|
|
+ </span>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="col-md-12">
|
|
<div class="col-md-12">
|
|
|
- <h4 class="form-section" style="margin-top:5px;margin-bottom:5px"></h4>
|
|
|
|
|
|
|
+ <h4 class="form-section" style="margin-top:5px;margin-bottom:5px"></h4>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- div para agregar cantidad con forma de pago -->
|
|
<!-- div para agregar cantidad con forma de pago -->
|
|
|
<div class="col-md-12" style="margin-top:10px">
|
|
<div class="col-md-12" style="margin-top:10px">
|
|
@@ -52,10 +52,10 @@
|
|
|
<span class="help-block">monto recibido. </span>
|
|
<span class="help-block">monto recibido. </span>
|
|
|
<div class="input-group col-md-11">
|
|
<div class="input-group col-md-11">
|
|
|
<span class="input-group-addon"> $ </span>
|
|
<span class="input-group-addon"> $ </span>
|
|
|
- <%= f.number_field :received, {:class=>"form-control mask_decimal"} %>
|
|
|
|
|
|
|
+ <%= f.number_field :received, {:class=>"form-control mask_decimal first_input"} %>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
<!-- cantidad -->
|
|
<!-- cantidad -->
|
|
|
<div class="col-md-4">
|
|
<div class="col-md-4">
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
@@ -65,7 +65,7 @@
|
|
|
<%= f.number_field :quantity, {:class=>"form-control mask_decimal"} %>
|
|
<%= f.number_field :quantity, {:class=>"form-control mask_decimal"} %>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
<!-- metodo de pago -->
|
|
<!-- metodo de pago -->
|
|
|
<div class="col-md-2">
|
|
<div class="col-md-2">
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
@@ -73,29 +73,29 @@
|
|
|
<div class="input-group col-md-12">
|
|
<div class="input-group col-md-12">
|
|
|
<%= f.select :payment_method_id, PaymentMethod.vigentes.map {|c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, {:class => "form-control" } %>
|
|
<%= f.select :payment_method_id, PaymentMethod.vigentes.map {|c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, {:class => "form-control" } %>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
<div class="col-md-2" style="margin-top: 30px;padding-right: 0px;">
|
|
<div class="col-md-2" style="margin-top: 30px;padding-right: 0px;">
|
|
|
<button type="button" class="btn green pull-right" onclick="addRow()">Agregar</button>
|
|
<button type="button" class="btn green pull-right" onclick="addRow()">Agregar</button>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
<!-- datos de la tarjeta cuando aplica -->
|
|
<!-- datos de la tarjeta cuando aplica -->
|
|
|
<div class="col-md-12" id="card_info" style="display: none;">
|
|
<div class="col-md-12" id="card_info" style="display: none;">
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<%= f.label :cardnumber, {:class=>"col-md-3 control-label", :autocomplete=> "off"} do %> Tarjeta: <span class="required">*</span>
|
|
<%= f.label :cardnumber, {:class=>"col-md-3 control-label", :autocomplete=> "off"} do %> Tarjeta: <span class="required">*</span>
|
|
|
<% end %>
|
|
<% end %>
|
|
|
<div class="col-md-8">
|
|
<div class="col-md-8">
|
|
|
- <%= f.text_field :cardnumber, {:class => "form-control"} %>
|
|
|
|
|
|
|
+ <%= f.text_field :cardnumber, {:class => "form-control"} %>
|
|
|
<span class="help-block">Ultimos 4 digitos de la tarjeta. </span>
|
|
<span class="help-block">Ultimos 4 digitos de la tarjeta. </span>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="col-md-12">
|
|
<div class="col-md-12">
|
|
|
<table class="table table-striped table-hover table-bordered" id="payments_table">
|
|
<table class="table table-striped table-hover table-bordered" id="payments_table">
|
|
|
<thead>
|
|
<thead>
|
|
|
<tr>
|
|
<tr>
|
|
|
- <th> Recibido </th>
|
|
|
|
|
|
|
+ <th> Recibido </th>
|
|
|
<th> Cobro </th>
|
|
<th> Cobro </th>
|
|
|
<th> Forma de pago </th>
|
|
<th> Forma de pago </th>
|
|
|
<th> Info. adicional </th>
|
|
<th> Info. adicional </th>
|
|
@@ -104,7 +104,7 @@
|
|
|
</thead>
|
|
</thead>
|
|
|
<tbody>
|
|
<tbody>
|
|
|
</tbody>
|
|
</tbody>
|
|
|
- </table>
|
|
|
|
|
|
|
+ </table>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- div para mostrar total -->
|
|
<!-- div para mostrar total -->
|
|
|
<div class="col-md-offset-6 col-md-6">
|
|
<div class="col-md-offset-6 col-md-6">
|
|
@@ -113,12 +113,12 @@
|
|
|
<div class="col-md-4" style="padding-left:0px"><h4 class="block pull-left">Cambio:</h4></div>
|
|
<div class="col-md-4" style="padding-left:0px"><h4 class="block pull-left">Cambio:</h4></div>
|
|
|
<div class="col-md-8 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
<div class="col-md-8 text-center" style="margin-top:10px;padding-right: 0px;">
|
|
|
<h4 id="display_change" class="pull-right"></h4>
|
|
<h4 id="display_change" class="pull-right"></h4>
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
<div class="col-md-12">
|
|
<div class="col-md-12">
|
|
|
- <span class="help-block">Este boton se habilita cuando se cubre la cantidad minima de anticipo. </span>
|
|
|
|
|
|
|
+ <span class="help-block">Este boton se habilita cuando se cubre la cantidad minima de anticipo. </span>
|
|
|
<button type="button" class="btn green btn-block" id="save_move" disabled onclick="confirmReserve()">Apartar</button>
|
|
<button type="button" class="btn green btn-block" id="save_move" disabled onclick="confirmReserve()">Apartar</button>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -126,17 +126,17 @@
|
|
|
<script type="text/javascript">
|
|
<script type="text/javascript">
|
|
|
$('#closemodal').removeAttr('data-dismiss');
|
|
$('#closemodal').removeAttr('data-dismiss');
|
|
|
$( "#closemodal" ).click(function() {
|
|
$( "#closemodal" ).click(function() {
|
|
|
- if (window.confirm("Está seguro que desea SALIR?, al salir SE CANCELARÁ EL APARTADO")) {
|
|
|
|
|
|
|
+ if (window.confirm("Está seguro que desea SALIR?, al salir SE CANCELARÁ EL APARTADO")) {
|
|
|
$.ajax({
|
|
$.ajax({
|
|
|
type: "DELETE",
|
|
type: "DELETE",
|
|
|
url: "/sales/" + <%= @sale.id %> ,
|
|
url: "/sales/" + <%= @sale.id %> ,
|
|
|
dataType: "json",
|
|
dataType: "json",
|
|
|
data: "",
|
|
data: "",
|
|
|
success: function(xhr, status, error) {
|
|
success: function(xhr, status, error) {
|
|
|
- window.location = "<%= new_sale_path %>";
|
|
|
|
|
|
|
+ window.location = "<%= new_sale_path %>";
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
$('#datetimepicker2').datetimepicker({
|
|
$('#datetimepicker2').datetimepicker({
|
|
@@ -154,10 +154,10 @@
|
|
|
$('#cash_registers_move_received').val("");
|
|
$('#cash_registers_move_received').val("");
|
|
|
} else {
|
|
} else {
|
|
|
$("#card_info").fadeOut();
|
|
$("#card_info").fadeOut();
|
|
|
- $("#cash_registers_move_cardnumber").val("");
|
|
|
|
|
- $('#cash_registers_move_received').attr('disabled', false);
|
|
|
|
|
|
|
+ $("#cash_registers_move_cardnumber").val("");
|
|
|
|
|
+ $('#cash_registers_move_received').attr('disabled', false);
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
|
|
|
|
|
$("#cash_register_move_form").bind('ajax:complete', function() {
|
|
$("#cash_register_move_form").bind('ajax:complete', function() {
|
|
@@ -165,7 +165,7 @@
|
|
|
$('#cash_registers_move_received').val('');
|
|
$('#cash_registers_move_received').val('');
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- function addRow() {
|
|
|
|
|
|
|
+ function addRow() {
|
|
|
$('#cash_register_move_form').submit();
|
|
$('#cash_register_move_form').submit();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -173,7 +173,7 @@
|
|
|
var total = parseFloat($('#reserve_sale_percent').val());
|
|
var total = parseFloat($('#reserve_sale_percent').val());
|
|
|
var totalInTable = 0;
|
|
var totalInTable = 0;
|
|
|
$('#payments_table tbody tr').each(function() {
|
|
$('#payments_table tbody tr').each(function() {
|
|
|
- totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
|
|
|
|
|
|
|
+ totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
if (totalInTable >= total) {
|
|
if (totalInTable >= total) {
|
|
@@ -193,10 +193,10 @@
|
|
|
data: "",
|
|
data: "",
|
|
|
success: function(xhr, status, error) {
|
|
success: function(xhr, status, error) {
|
|
|
input.closest('tr').remove();
|
|
input.closest('tr').remove();
|
|
|
- unlockConfirmPayment();
|
|
|
|
|
- calculateChange();
|
|
|
|
|
|
|
+ unlockConfirmPayment();
|
|
|
|
|
+ calculateChange();
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function confirmReserve() {
|
|
function confirmReserve() {
|
|
@@ -205,21 +205,21 @@
|
|
|
url: "/confirm_reserve/" + $('#cash_registers_move_sale_id').val(),
|
|
url: "/confirm_reserve/" + $('#cash_registers_move_sale_id').val(),
|
|
|
dataType: "script",
|
|
dataType: "script",
|
|
|
data: "",
|
|
data: "",
|
|
|
- success: function(xhr, status, error) {
|
|
|
|
|
|
|
+ success: function(xhr, status, error) {
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function calculateChange() {
|
|
function calculateChange() {
|
|
|
- var total = parseFloat($('#reserve_sale_percent').val());
|
|
|
|
|
|
|
+ var total = parseFloat($('#reserve_sale_percent').val());
|
|
|
var received_cash = parseFloat($('#cash_registers_move_received').val());
|
|
var received_cash = parseFloat($('#cash_registers_move_received').val());
|
|
|
- totalInTable = 0;
|
|
|
|
|
|
|
+ totalInTable = 0;
|
|
|
|
|
|
|
|
$('#payments_table tbody tr').each(function() {
|
|
$('#payments_table tbody tr').each(function() {
|
|
|
if ($(this).find("td:nth-child(3) input").val() == <%= @cash_id %>) {
|
|
if ($(this).find("td:nth-child(3) input").val() == <%= @cash_id %>) {
|
|
|
totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
|
|
totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
var change = received_cash - totalInTable;
|
|
var change = received_cash - totalInTable;
|
|
|
if (change > 0 && totalInTable > 0) {
|
|
if (change > 0 && totalInTable > 0) {
|
|
@@ -228,6 +228,6 @@
|
|
|
} else {
|
|
} else {
|
|
|
// $('#display_change').html(formatter.format(0));
|
|
// $('#display_change').html(formatter.format(0));
|
|
|
$('#display_change').html(accounting.formatMoney(0));
|
|
$('#display_change').html(accounting.formatMoney(0));
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-</script>
|
|
|
|
|
|
|
+</script>
|