diff --git a/debian/changelog b/debian/changelog index 5b392755..0183a141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.96) stable; urgency=low +hedera-web (1.405.97) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml index bf9898b9..7eace352 100644 --- a/forms/ecomerce/confirm/ui.xml +++ b/forms/ecomerce/confirm/ui.xml @@ -2,25 +2,23 @@ - - CALL basketGetTax; - SELECT o.id, o.date_send, o.note, o.company_id, - ag.description agency, v.code method, - ad.nickname, ad.postalCode, ad.city, ad.street, - t.*, c.credit, myClientGetDebt(NULL) debt - FROM basket o - JOIN vn.agencyMode ag ON ag.id = o.agency_id - LEFT JOIN myAddress ad ON ad.id = o.address_id - JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id - JOIN myClient c - JOIN ( - SELECT - IFNULL(SUM(taxBase), 0) taxBase, - IFNULL(SUM(tax + equalizationTax), 0) tax - FROM tmp.orderTax - ) t; - DROP TEMPORARY TABLE tmp.orderTax; - + CALL basketGetTax; + SELECT o.id, o.date_send, o.note, o.company_id, + ag.description agency, v.code method, + ad.nickname, ad.postalCode, ad.city, ad.street, + t.*, c.credit, myClientGetDebt(NULL) debt + FROM basket o + JOIN vn.agencyMode ag ON ag.id = o.agency_id + LEFT JOIN myAddress ad ON ad.id = o.address_id + JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id + JOIN myClient c + JOIN ( + SELECT + IFNULL(SUM(taxBase), 0) taxBase, + IFNULL(SUM(tax + equalizationTax), 0) tax + FROM tmp.orderTax + ) t; + DROP TEMPORARY TABLE tmp.orderTax; @@ -173,23 +171,12 @@ Make a transfer to one account. - - SELECT description, iban, entity_id, office, dc, number - FROM vn2008.account_customer c - + SELECT name, iban FROM mainAccountBank diff --git a/package.json b/package.json index 4622f98c..1ffc2cf1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.96", + "version": "1.405.97", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {