verdnatura/hedera-web
verdnatura
/
hedera-web
0
1
Fork 2
Code Issues Pull Requests 6 Releases Wiki Activity

Account IBAN fixed

This commit is contained in:
Juan 2018-05-17 12:09:29 +02:00
parent f5f0904d85
commit 177133b6c0
3 changed files with 22 additions and 35 deletions
debian
changelog
forms/ecomerce/confirm
ui.xml
package.json

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.405.96) stable; urgency=low
hedera-web (1.405.97) stable; urgency=low
* Initial Release.

53
forms/ecomerce/confirm/ui.xml
View File

@ -2,25 +2,23 @@
<vn-group>
<db-form id="order-form" on-ready="onOrderReady">
<db-model property="model" result-index="1">
<custom>
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;
</custom>
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;
</db-model>
</db-form>
<db-query id="confirm-query" on-ready="onConfirm">
@ -173,23 +171,12 @@
<t>Make a transfer to one account.</t>
<htk-repeater form-id="iter">
<db-model property="model">
<custom>
SELECT description, iban, entity_id, office, dc, number
FROM vn2008.account_customer c
</custom>
SELECT name, iban FROM mainAccountBank
</db-model>
<custom>
<div class="transfer-account">
<p>
<htk-text form="iter" column="description"/>
</p>
<p>
<htk-text form="iter" column="iban"/>
<htk-text form="iter" column="entity_id"/>
<htk-text form="iter" column="office"/>
<htk-text form="iter" column="dc"/>
<htk-text form="iter" column="number"/>
</p>
<p><htk-text form="iter" column="name"/></p>
<p><htk-text form="iter" column="iban"/></p>
</div>
</custom>
</htk-repeater>

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "1.405.96",
"version": "1.405.97",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {