diff --git a/debian/changelog b/debian/changelog index fb022fba..61248dae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.48) stable; urgency=low +hedera-web (1.405.49) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index bbf125a7..b1403f9a 100644 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -7,7 +7,7 @@ SELECT o.id, o.date_send, o.note, o.company_id, ag.description agency, v.code method, ad.consignee, ad.zip_code, ad.city, ad.name address, - t.*, c.credit, customer_get_debt() debt + t.*, c.credit, clientGetDebt(NULL) debt FROM basket o JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id LEFT JOIN address_view ad ON ad.id = o.address_id diff --git a/forms/ecomerce/orders/orders.js b/forms/ecomerce/orders/orders.js index a4214ccd..cc1c6df6 100644 --- a/forms/ecomerce/orders/orders.js +++ b/forms/ecomerce/orders/orders.js @@ -17,14 +17,14 @@ Hedera.Orders = new Class ,onBasketClick: function () { - this.hash.set ({'form': 'ecomerce/basket'}); + this.hash.set ({form: 'ecomerce/basket'}); } ,repeaterFunc: function (res, form) { res.$('link').href = this.hash.make ({ - 'form': 'ecomerce/ticket', - 'ticket': form.get ('ticket_id') + form: 'ecomerce/ticket', + ticket: form.get ('ticket_id') }); } diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml index 5aafbff0..4d57a3f7 100644 --- a/forms/ecomerce/orders/ui.xml +++ b/forms/ecomerce/orders/ui.xml @@ -1,13 +1,4 @@ - - - - CALL customer_get_debt_by_company (); - SELECT -amount amount FROM t_customer_debt; - DROP TEMPORARY TABLE t_customer_debt; - - -

LastOrders

@@ -28,16 +19,19 @@ Balance: - - + conditional-func="balanceConditionalFunc" + column="debt"> + + + + SELECT clientGetDebt(NULL) debt + + + - +