Account IBAN fixed

debian/changelog

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

forms/ecomerce/confirm/ui.xml

@@ -2,25 +2,23 @@
 <vn-group>
 	<db-form id="order-form" on-ready="onOrderReady">
 		<db-model property="model" result-index="1">
-			<custom>
+			CALL basketGetTax;
-				CALL basketGetTax;
+			SELECT o.id, o.date_send, o.note, o.company_id, 
-				SELECT o.id, o.date_send, o.note, o.company_id, 
+				ag.description agency, v.code method, 
-					ag.description agency, v.code method, 
+				ad.nickname, ad.postalCode, ad.city, ad.street, 
-					ad.nickname, ad.postalCode, ad.city, ad.street, 
+				t.*, c.credit, myClientGetDebt(NULL) debt
-					t.*, c.credit, myClientGetDebt(NULL) debt
+				FROM basket o
-					FROM basket o
+					JOIN vn.agencyMode ag ON ag.id = o.agency_id 
-						JOIN vn.agencyMode ag ON ag.id = o.agency_id 
+					LEFT JOIN myAddress ad ON ad.id = o.address_id 
-						LEFT JOIN myAddress ad ON ad.id = o.address_id 
+					JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id
-						JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id
+					JOIN myClient c
-						JOIN myClient c
+					JOIN (
-						JOIN (
+						SELECT
-							SELECT
+							IFNULL(SUM(taxBase), 0) taxBase,
-								IFNULL(SUM(taxBase), 0) taxBase,
+							IFNULL(SUM(tax + equalizationTax), 0) tax
-								IFNULL(SUM(tax + equalizationTax), 0) tax
+							FROM tmp.orderTax
-								FROM tmp.orderTax
+					) t;
-						) t;
+			DROP TEMPORARY TABLE tmp.orderTax;
-				DROP TEMPORARY TABLE tmp.orderTax;					
-			</custom>
 		</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 name, iban FROM mainAccountBank	
-									SELECT description, iban, entity_id, office, dc, number
-										FROM vn2008.account_customer c						
-								</custom>
 							</db-model>
 							<custom>
 								<div class="transfer-account">
-									<p>
+									<p><htk-text form="iter" column="name"/></p>
-										<htk-text form="iter" column="description"/>
+									<p><htk-text form="iter" column="iban"/></p>
-									</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>
 								</div>
 							</custom>
 						</htk-repeater>

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": {