From 884653412b812449c5a6bf71a0c856fe3ebe995b Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Sun, 26 Nov 2017 15:16:56 +0100
Subject: [PATCH] Ids displayed for orders and items, showing user.nickname
instead of client.alias
---
debian/changelog | 2 +-
forms/ecomerce/catalog/ui.xml | 3 +++
forms/ecomerce/orders/ui.xml | 3 +++
js/hedera/gui.js | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8ed3f2d..5789dae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.13) stable; urgency=low
+hedera-web (1.405.14) stable; urgency=low
* Initial Release.
diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml
index 5054641e..33b6cc07 100755
--- a/forms/ecomerce/catalog/ui.xml
+++ b/forms/ecomerce/catalog/ui.xml
@@ -431,6 +431,9 @@
<p class="producer">
<htk-text form="card" column="producer"/>
</p>
+ <p>
+ @<htk-text form="card" column="item_id"/>
+ </p>
<p>
<t>Size</t> <htk-text form="card" column="Medida"/>,
<t>Category</t> <htk-text form="card" column="Categoria"/>
diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml
index bb2385ad..5aafbff0 100755
--- a/forms/ecomerce/orders/ui.xml
+++ b/forms/ecomerce/orders/ui.xml
@@ -61,6 +61,9 @@
<p class="important">
<htk-text form="iter" column="date" format="%D"/>
</p>
+ <p>
+ @<htk-text form="iter" column="ticket_id"/>
+ </p>
<p>
<htk-text form="iter" column="consignee"/>
</p>
diff --git a/js/hedera/gui.js b/js/hedera/gui.js
index afa6a80f..8ac645ee 100644
--- a/js/hedera/gui.js
+++ b/js/hedera/gui.js
@@ -55,7 +55,7 @@ module.exports = new Class
this.$('social-bar').conn = this._conn;
- var sql = 'SELECT name FROM customer_user;'
+ var sql = 'SELECT nickname FROM account.userView;'
+'SELECT default_form, image_dir, image_host FROM config;'
+'SELECT production_domain, test_domain FROM config;';
this._conn.execQuery (sql, this.onMainQueryDone.bind (this));