forked from verdnatura/hedera-web
zone
This commit is contained in:
parent
46f0420431
commit
6e59fd8ea7
|
|
@ -1,4 +1,4 @@
|
|||
hedera-web (1.406.51) stable; urgency=low
|
||||
hedera-web (1.406.52) stable; urgency=low
|
||||
|
||||
* Initial Release.
|
||||
|
||||
|
|
|
|||
|
|
@ -52,19 +52,19 @@
|
|||
id="items-model"
|
||||
result-index="2"
|
||||
on-status-changed="onItemsChange">
|
||||
CREATE TEMPORARY TABLE tmp.bionic_calc
|
||||
(INDEX (item_id))
|
||||
CREATE TEMPORARY TABLE tmp.item
|
||||
(INDEX (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT i.id item_id
|
||||
SELECT i.id itemFk
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
WHERE #filter;
|
||||
CALL bionic_calc;
|
||||
CALL myBasket_calcCatalogFull;
|
||||
SELECT i.id, i.description, i.longName item,
|
||||
i.subName, i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7,
|
||||
b.available, b.price, i.image, im.updated
|
||||
FROM tmp.bionic_item b
|
||||
JOIN vn.item i ON i.id = b.item_id
|
||||
FROM tmp.ticketCalculateItem b
|
||||
JOIN vn.item i ON i.id = b.itemFk
|
||||
LEFT JOIN image im
|
||||
ON im.collectionFk = 'catalog'
|
||||
AND im.name = i.image
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
conn="conn"
|
||||
result-index="1"
|
||||
on-status-changed="refreshTitle">
|
||||
CALL itemGetAvailable;
|
||||
CALL myBasket_getAvailable;
|
||||
SELECT DISTINCT t.id, l.name
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
placeholder="_Color"
|
||||
param="color">
|
||||
<db-model property="model" auto-load="false" result-index="1">
|
||||
CALL itemGetAvailable;
|
||||
CALL myBasket_getAvailable;
|
||||
SELECT DISTINCT l.id, l.name
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
|
|
@ -259,7 +259,7 @@
|
|||
placeholder="_Producer"
|
||||
param="producer">
|
||||
<db-model property="model" auto-load="false" result-index="1">
|
||||
CALL itemGetAvailable;
|
||||
CALL myBasket_getAvailable;
|
||||
SELECT DISTINCT p.id, p.name
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
|
|
@ -281,7 +281,7 @@
|
|||
placeholder="_Origin"
|
||||
param="origin">
|
||||
<db-model property="model" auto-load="false" result-index="1">
|
||||
CALL itemGetAvailable;
|
||||
CALL myBasket_getAvailable;
|
||||
SELECT DISTINCT o.id, l.name, o.code
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
|
|
@ -304,7 +304,7 @@
|
|||
placeholder="_Category"
|
||||
param="category">
|
||||
<db-model property="model" auto-load="false" result-index="1">
|
||||
CALL itemGetAvailable;
|
||||
CALL myBasket_getAvailable;
|
||||
SELECT DISTINCT i.category, i.category
|
||||
FROM vn.item i
|
||||
JOIN vn.itemType t ON t.id = i.typeFk
|
||||
|
|
@ -440,11 +440,11 @@
|
|||
result-index="1"
|
||||
on-status-changed-after="onCardLoad"
|
||||
batch="card-batch">
|
||||
CALL bionic_from_item (#item);
|
||||
SELECT w.id warehouseFk, w.name warehouse, p.`grouping`, p.price, p.rate, l.available
|
||||
FROM tmp.bionic_lot l
|
||||
JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id
|
||||
JOIN vn.warehouse w ON w.id = p.warehouse_id
|
||||
CALL myBasket_calcCatalogFromItem(#item);
|
||||
SELECT l.warehouseFk, w.name warehouse, p.`grouping`, p.price, p.rate, l.available
|
||||
FROM tmp.ticketLot l
|
||||
JOIN tmp.ticketComponentPrice p ON p.warehouseFk = l.warehouseFk
|
||||
JOIN vn.warehouse w ON w.id = p.warehouseFk
|
||||
ORDER BY warehouseFk, `grouping`;
|
||||
</db-model>
|
||||
<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
|
||||
|
|
|
|||
|
|
@ -21,16 +21,14 @@
|
|||
auto-load="false"
|
||||
result-index="1"
|
||||
on-status-changed="onAgenciesReady">
|
||||
CALL vn.agencyListAvailable (#date, #address);
|
||||
SELECT DISTINCT m.id, m.description
|
||||
FROM tmp.agencyAvailable a
|
||||
JOIN vn.agencyMode m
|
||||
ON m.agencyFk = a.agencyFk
|
||||
CALL vn.zoneGetAgency(#address, #date);
|
||||
SELECT DISTINCT a.agencyModeFk id, a.description
|
||||
FROM tmp.zoneGetAgency a
|
||||
JOIN vn.deliveryMethod d
|
||||
ON d.id = m.deliveryMethodFk
|
||||
ON d.id = a.deliveryMethodFk
|
||||
WHERE d.code IN ('AGENCY', 'DELIVERY')
|
||||
ORDER BY m.description;
|
||||
DROP TEMPORARY TABLE tmp.agencyAvailable;
|
||||
ORDER BY a.description;
|
||||
DROP TEMPORARY TABLE tmp.zoneGetAgency;
|
||||
<sql-batch property="batch">
|
||||
<custom>
|
||||
<item name="address" param="address"/>
|
||||
|
|
@ -42,16 +40,14 @@
|
|||
auto-load="false"
|
||||
result-index="1"
|
||||
on-status-changed="onWarehousesReady">
|
||||
CALL vn.agencyListAvailable (#date, #address);
|
||||
SELECT DISTINCT m.id, m.description
|
||||
FROM tmp.agencyAvailable a
|
||||
JOIN vn.agencyMode m
|
||||
ON m.agencyFk = a.agencyFk
|
||||
CALL vn.zoneGetAgency(#address, #date);
|
||||
SELECT DISTINCT a.agencyModeFk id, a.description
|
||||
FROM tmp.zoneGetAgency a
|
||||
JOIN vn.deliveryMethod d
|
||||
ON d.id = m.deliveryMethodFk
|
||||
ON d.id = a.deliveryMethodFk
|
||||
WHERE d.code IN ('PICKUP')
|
||||
ORDER BY m.description;
|
||||
DROP TEMPORARY TABLE tmp.agencyAvailable;
|
||||
ORDER BY a.description;
|
||||
DROP TEMPORARY TABLE tmp.zoneGetAgency;
|
||||
<sql-batch property="batch">
|
||||
<custom>
|
||||
<item name="address" param="address"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "1.406.51",
|
||||
"version": "1.406.52",
|
||||
"description": "Verdnatura web page",
|
||||
"license": "GPL-3.0",
|
||||
"repository": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue