verdnatura/hedera-web
verdnatura
/
hedera-web
0
1
Fork 3
Code Issues Pull Requests 7 Releases Wiki Activity

SQL refactor

This commit is contained in:
Juan 2018-05-18 13:52:05 +02:00
parent b56a12c341
commit 7f2f0372b3
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

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

20
forms/ecomerce/catalog/ui.xml
View File

@ -212,11 +212,11 @@
conn="conn" conn="conn"
result-index="1" result-index="1"
on-status-changed="refreshTitle"> on-status-changed="refreshTitle">
CALL item_available (); CALL itemGetAvailable;
SELECT DISTINCT t.id, l.name SELECT DISTINCT t.id, l.name
FROM vn.item i FROM vn.item i
JOIN vn.itemType t ON t.id = i.typeFk JOIN vn.itemType t ON t.id = i.typeFk
JOIN tmp.item_available a ON a.item_id = i.id JOIN tmp.itemAvailable a ON a.id = i.id
JOIN vn.itemTypeL10n l ON l.id = t.id JOIN vn.itemTypeL10n l ON l.id = t.id
WHERE #filter WHERE #filter
ORDER BY name ORDER BY name
@ -232,11 +232,11 @@
placeholder="_Color" placeholder="_Color"
param="color"> param="color">
<db-model property="model" auto-load="false" result-index="1"> <db-model property="model" auto-load="false" result-index="1">
CALL item_available (); CALL itemGetAvailable;
SELECT DISTINCT l.id, l.name SELECT DISTINCT l.id, l.name
FROM vn.item i FROM vn.item i
JOIN vn.itemType t ON t.id = i.typeFk JOIN vn.itemType t ON t.id = i.typeFk
JOIN tmp.item_available a ON a.item_id = i.id JOIN tmp.itemAvailable a ON a.id = i.id
JOIN vn.inkL10n l ON l.id = i.inkFk JOIN vn.inkL10n l ON l.id = i.inkFk
WHERE #filter WHERE #filter
ORDER BY name ORDER BY name
@ -254,11 +254,11 @@
placeholder="_Producer" placeholder="_Producer"
param="producer"> param="producer">
<db-model property="model" auto-load="false" result-index="1"> <db-model property="model" auto-load="false" result-index="1">
CALL item_available (); CALL itemGetAvailable;
SELECT DISTINCT p.id, p.name SELECT DISTINCT p.id, p.name
FROM vn.item i FROM vn.item i
JOIN vn.itemType t ON t.id = i.typeFk JOIN vn.itemType t ON t.id = i.typeFk
JOIN tmp.item_available a ON a.item_id = i.id JOIN tmp.itemAvailable a ON a.id = i.id
JOIN vn.producer p ON p.id = i.producerFk JOIN vn.producer p ON p.id = i.producerFk
WHERE #filter WHERE #filter
ORDER BY name ORDER BY name
@ -276,11 +276,11 @@
placeholder="_Origin" placeholder="_Origin"
param="origin"> param="origin">
<db-model property="model" auto-load="false" result-index="1"> <db-model property="model" auto-load="false" result-index="1">
CALL item_available (); CALL itemGetAvailable;
SELECT DISTINCT o.id, l.name, o.code SELECT DISTINCT o.id, l.name, o.code
FROM vn.item i FROM vn.item i
JOIN vn.itemType t ON t.id = i.typeFk JOIN vn.itemType t ON t.id = i.typeFk
JOIN tmp.item_available a ON a.item_id = i.id JOIN tmp.itemAvailable a ON a.id = i.id
JOIN vn.origin o ON o.id = i.originFk JOIN vn.origin o ON o.id = i.originFk
JOIN vn.originL10n l ON l.id = o.id JOIN vn.originL10n l ON l.id = o.id
WHERE #filter WHERE #filter
@ -299,11 +299,11 @@
placeholder="_Category" placeholder="_Category"
param="category"> param="category">
<db-model property="model" auto-load="false" result-index="1"> <db-model property="model" auto-load="false" result-index="1">
CALL item_available (); CALL itemGetAvailable;
SELECT DISTINCT i.category, i.category SELECT DISTINCT i.category, i.category
FROM vn.item i FROM vn.item i
JOIN vn.itemType t ON t.id = i.typeFk JOIN vn.itemType t ON t.id = i.typeFk
JOIN tmp.item_available a ON a.item_id = i.id JOIN tmp.itemAvailable a ON a.id = i.id
WHERE #filter WHERE #filter
ORDER BY category ORDER BY category
</db-model> </db-model>

2
forms/ecomerce/confirm/confirm.js
View File

@ -162,7 +162,7 @@ Hedera.Confirm = new Class
var payAmount = this.$('total-amount').value; var payAmount = this.$('total-amount').value;
var tpv = new Hedera.Tpv ({conn: this.conn}); var tpv = new Hedera.Tpv ({conn: this.conn});
tpv.pay (payAmount, this.$('order-form').get ('company_id')); tpv.pay (payAmount, this.$('order-form').get ('companyFk'));
} }
else else
this.hash.set ({'form': 'ecomerce/orders'}); this.hash.set ({'form': 'ecomerce/orders'});

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

@ -3,14 +3,14 @@
<db-form id="order-form" on-ready="onOrderReady"> <db-form id="order-form" on-ready="onOrderReady">
<db-model property="model" result-index="1"> <db-model property="model" result-index="1">
CALL basketGetTax; CALL basketGetTax;
SELECT o.id, o.date_send, o.note, o.company_id, SELECT o.id, o.sent, o.notes, o.companyFk,
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 myBasket o
JOIN vn.agencyMode ag ON ag.id = o.agency_id JOIN vn.agencyMode ag ON ag.id = o.agencyModeFk
LEFT JOIN myAddress ad ON ad.id = o.address_id LEFT JOIN myAddress ad ON ad.id = o.addressFk
JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id JOIN vn.deliveryMethod v ON v.id = o.deliveryMethodFk
JOIN myClient c JOIN myClient c
JOIN ( JOIN (
SELECT SELECT
@ -34,7 +34,7 @@
<div class="delivery"> <div class="delivery">
<p> <p>
<t>Delivery at</t> <t>Delivery at</t>
<htk-text format="%D" form="order-form" column="date_send"/> <htk-text format="%D" form="order-form" column="sent"/>
</p> </p>
<p> <p>
<span id="method"><t>Agency</t></span> <span id="method"><t>Agency</t></span>

2
package.json
View File

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