0
1
Fork 0

Añadida la opcion de entrega a cuenta en pedidos

This commit is contained in:
Juan Ferrer Toribio 2014-05-10 14:18:47 +02:00
parent 9943703f61
commit bdbf0123a0
6 changed files with 30 additions and 10 deletions

View File

@ -12,6 +12,7 @@
,"ConfirmedOrdersDesc":
"Encarrecs confirmats més recents."
,"MoneyDelivery": "Lliurament a compte"
,"SeeOrder": "Mostrar detall de l'encàrrec"
,"TicketNumber": "N ticket"
,"SentAddress": "Adreça d'enviament"
@ -21,7 +22,7 @@
,"Pending": "Pendent"
,"PayOrder": "Pagar encàrrec"
,"AmountToPay:": "Quantitat a pagar:"
,"AmountToPay:": "Quantitat a pagar (€):"
,"AmountError": "La quantitat ha de ser un nombre positiu i inferior o igual a l'import pendent"
,"PayError": "Error al realitzar el pagament"
}

View File

@ -12,6 +12,7 @@
,"ConfirmedOrdersDesc":
"Pedidos confirmados más recientes."
,"MoneyDelivery": "Entrega a cuenta"
,"SeeOrder": "Mostrar detalle del pedido"
,"TicketNumber": "Nº ticket"
,"SentAddress": "Dirección de envío"
@ -21,7 +22,7 @@
,"Pending": "Pendiente"
,"PayOrder": "Pagar pedido"
,"AmountToPay:": "Cantidad a pagar:"
,"AmountToPay:": "Cantidad a pagar (€):"
,"AmountError": "La cantidad debe ser un número positivo e inferior o igual al importe pendiente"
,"PayError": "Error al realizar el pago"
}

View File

@ -12,6 +12,7 @@
,"ConfirmedOrdersDesc":
"Commandes confirmées."
,"MoneyDelivery": "Livraison de l'argent sur compte"
,"SeeOrder": "Votre panier"
,"TicketNumber": "Numéro ticket"
,"SentAddress": "Adresse de livraison"
@ -21,7 +22,7 @@
,"Pending": "En attente"
,"PayOrder": "Payer la commande"
,"AmountToPay:": "Montant à payer:"
,"AmountToPay:": "Montant à payer (€):"
,"AmountError": "La quantité doit être un neméro positif et inférieur ou égal à la somme restant à payer"
,"PayError": "Impossible d'effectuer le paiement"
}

View File

@ -21,6 +21,7 @@
<div class="info">
<img src="image/ok.png" alt=""/>
<?php i('ConfirmedOrdersDesc') ?>
<button id="money-delivery"><?php i('MoneyDelivery') ?></button>
</div>
<div>
<htk-grid>

View File

@ -6,6 +6,7 @@ Vn.Orders = new Class
,activate: function ()
{
Vn.get ('start-order').addEventListener ('click', this.onStartClick.bind (this));
Vn.get ('money-delivery').addEventListener ('click', this.onMoneyDeliveryClick.bind (this));
this.get ('edit-order').on ('clicked', this.onContinueClick, this);
this.get ('edit-ticket').on ('clicked', this.onShowClick, this);
this.get ('pay-ticket').on ('clicked', this.onPayClick, this);
@ -59,25 +60,39 @@ Vn.Orders = new Class
}
// TPV
,onMoneyDeliveryClick: function ()
{
this.pay (null, 20000.0, null);
}
,onPayClick: function (column, value, row)
{
var model = this.get ('tickets');
var ticketId = model.get (row, 'ticket_id');
var ticket = model.get (row, 'ticket_id');
var pending = model.get (row, 'pending');
if (!ticketId || !pending)
if (!ticket || !pending)
return;
var pendingStr = Vn.Value.format (pending, '%.2d');
var amount = parseFloat (prompt (_('AmountToPay:'), pendingStr));
this.pay (pending, pending, ticket);
}
if (amount > 0 && amount <= pending)
,pay: function (defaultAmount, maxAmount, ticket)
{
var defaultAmountStr = '';
if (defaultAmount !== null)
defaultAmountStr = Vn.Value.format (defaultAmount, '%.2d');
var amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr));
if (amount > 0 && (maxAmount === null || amount <= maxAmount))
{
var query = 'CALL transaction_start (#ticket, #amount)';
var batch = new Sql.Batch ();
batch.addValue ('ticket', ticketId);
batch.addValue ('ticket', ticket);
batch.addValue ('amount', parseInt (amount * 100));
this.conn.execQuery (query,

View File

@ -1,4 +1,5 @@
#start-order
#start-order,
#money-delivery
{
position: absolute;
right: 25px;