diff --git a/debian/changelog b/debian/changelog index 654b616a..4a3246f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.71) stable; urgency=low +hedera-web (1.405.72) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/checkout/checkout.js b/forms/ecomerce/checkout/checkout.js index 5d8bce26..9a1ddc31 100644 --- a/forms/ecomerce/checkout/checkout.js +++ b/forms/ecomerce/checkout/checkout.js @@ -80,7 +80,7 @@ Hedera.Checkout = new Class else Htk.Toast.showMessage (_('OrderStarted')); - this.hash.set ({'form': 'ecomerce/catalog'}); + this.hash.set ({form: 'ecomerce/catalog'}); } ,onCancelClick: function () @@ -92,31 +92,12 @@ Hedera.Checkout = new Class } ,agencySteps: ['method', 'date', 'address', 'agency', 'confirm-agency'] - ,deliverySteps: ['method', 'date', 'address', null, 'confirm-delivery'] ,pickupSteps: ['method', 'date', 'address', 'pickup', 'confirm-pickup'] ,stepFunc: function (stepIndex) { - var steps; - var isDelivery; - - switch (this.$('rg-method').value) - { - case 'AGENCY': - steps = this.agencySteps; - isDelivery = true; - break; - case 'DELIVERY': - steps = this.deliverySteps; - isDelivery = true; - break; - case 'PICKUP': - default: - steps = this.pickupSteps; - isDelivery = false; - break; - } - + var isDelivery = this.$('rg-method').value == 'AGENCY'; + var steps = isDelivery ? this.agencySteps : this.pickupSteps; var stepId = steps[stepIndex]; if (!stepId) @@ -130,6 +111,11 @@ Hedera.Checkout = new Class _('OrderDatePickupQuestion')); this.$('calendar').goToSelectedMonth (); break; + case 'address': + Vn.Node.setText (this.$('address-question'), isDelivery ? + _('AddressQuestion'): + _('AddressQuestionPickup')); + break; case 'agency': this.$('agencies').refresh (); break; @@ -144,7 +130,7 @@ Hedera.Checkout = new Class ,onFieldChange: function () { if (!this.autoStepLocked) - setTimeout (this.goNextStep.bind (this), 75); + this.$('assistant').moveNext (); } ,goNextStep: function () diff --git a/forms/ecomerce/checkout/locale/ca.json b/forms/ecomerce/checkout/locale/ca.json index 3f0764fc..72f58978 100644 --- a/forms/ecomerce/checkout/locale/ca.json +++ b/forms/ecomerce/checkout/locale/ca.json @@ -12,6 +12,7 @@ ,"OrderDateDeliveryQuestion": "Quin dia vols rebre la comanda?" ,"OrderDatePickupQuestion": "Quin dia vols recollir la comanda?" ,"AddressQuestion": "On vols rebre la comanda?" + ,"AddressQuestionPickup": "A què direcció vols associar la comanda? (Opcional)" ,"AgencyQuestion": "Per quina agència vols rebre la comanda?" ,"PickupWarehouseQuestion": "En quin magatzem vols recollir la comanda?" diff --git a/forms/ecomerce/checkout/locale/en.json b/forms/ecomerce/checkout/locale/en.json index 9ba28bcc..e29984eb 100644 --- a/forms/ecomerce/checkout/locale/en.json +++ b/forms/ecomerce/checkout/locale/en.json @@ -12,6 +12,7 @@ ,"OrderDateDeliveryQuestion": "What day you want to receive the order?" ,"OrderDatePickupQuestion": "What day you want to pickup your order?" ,"AddressQuestion": "Where do you want to receive the order?" + ,"AddressQuestionPickup": "To which address do you want to associate the order? (Optional)" ,"AgencyQuestion": "By wich agency you want to receive the order?" ,"PickupWarehouseQuestion": "What store you want to pickup your order?" diff --git a/forms/ecomerce/checkout/locale/es.json b/forms/ecomerce/checkout/locale/es.json index b2f1bcab..f6c48402 100644 --- a/forms/ecomerce/checkout/locale/es.json +++ b/forms/ecomerce/checkout/locale/es.json @@ -12,6 +12,7 @@ ,"OrderDateDeliveryQuestion": "¿Qué día quieres recibir el pedido?" ,"OrderDatePickupQuestion": "¿Qué día quieres recoger el pedido?" ,"AddressQuestion": "¿Dónde quieres recibir el pedido?" + ,"AddressQuestionPickup": "¿A qué dirección quieres asociar el pedido? (Opcional)" ,"AgencyQuestion": "¿Por qué agencia quieres recibir el pedido?" ,"PickupWarehouseQuestion": "¿En qué almacén quieres recoger el pedido?" diff --git a/forms/ecomerce/checkout/locale/fr.json b/forms/ecomerce/checkout/locale/fr.json index 13be44cc..7a9ca916 100644 --- a/forms/ecomerce/checkout/locale/fr.json +++ b/forms/ecomerce/checkout/locale/fr.json @@ -12,6 +12,7 @@ ,"OrderDateDeliveryQuestion": "Date de livraison?" ,"OrderDatePickupQuestion": "Date retrait commande?" ,"AddressQuestion": "Adresse livraison?" + ,"AddressQuestionPickup": "À quelle adresse voulez-vous associer la commande? (Optionnel)" ,"AgencyQuestion": "Pour quelle agence vous souhaitez recevoir la commande?" ,"PickupWarehouseQuestion": "Dans quel magasin vuoulez-vous retirer votre commande?" diff --git a/forms/ecomerce/checkout/locale/pt.json b/forms/ecomerce/checkout/locale/pt.json index 4199e8a7..0424dffc 100644 --- a/forms/ecomerce/checkout/locale/pt.json +++ b/forms/ecomerce/checkout/locale/pt.json @@ -12,6 +12,7 @@ ,"OrderDateDeliveryQuestion": "Que dia queres receber a encomenda?" ,"OrderDatePickupQuestion": "Que dia queres levantar a encomenda?" ,"AddressQuestion": "Onde queres receber a encomenda?" + ,"AddressQuestionPickup": "Para qual endereço deseja associar o pedido? (Opcional)" ,"AgencyQuestion": "Por qual agência queres receber a encomenda?" ,"PickupWarehouseQuestion": "Em qual armazém queres levantar a encomenda?" diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml index a5467f96..c5826442 100644 --- a/forms/ecomerce/checkout/ui.xml +++ b/forms/ecomerce/checkout/ui.xml @@ -21,9 +21,20 @@ - + - CALL vn.agencyListForMethod(#date, #address, 'AGENCY') + CALL vn.agencyListAvailable (#date, #address); + SELECT DISTINCT m.id, m.description + FROM tmp.agencyAvailable a + JOIN vn.agencyMode m + ON m.agencyFk = a.agencyFk + JOIN vn.deliveryMethod d + ON d.id = m.deliveryMethodFk + WHERE d.code IN ('AGENCY', 'DELIVERY'); + DROP TEMPORARY TABLE tmp.agencyAvailable; @@ -32,9 +43,20 @@ - + - CALL vn.agencyListForMethod(#date, #address, 'PICKUP') + CALL vn.agencyListAvailable (#date, #address); + SELECT DISTINCT m.id, m.description + FROM tmp.agencyAvailable a + JOIN vn.agencyMode m + ON m.agencyFk = a.agencyFk + JOIN vn.deliveryMethod d + ON d.id = m.deliveryMethodFk + WHERE d.code IN ('PICKUP'); + DROP TEMPORARY TABLE tmp.agencyAvailable; @@ -73,10 +95,6 @@ -
- - -
@@ -84,7 +102,7 @@
-

OrderDateDeliveryQuestion

+

-

AddressQuestion

+