feat(catalog_calculate): refs #8674 new field and modified proc
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
Refs: #8674
This commit is contained in:
parent
73d92db112
commit
1b3e5a2576
|
@ -122,6 +122,24 @@ BEGIN
|
||||||
LEFT JOIN agencyModeItemType ait
|
LEFT JOIN agencyModeItemType ait
|
||||||
ON ait.agencyModeFk = vAgencyModeFk
|
ON ait.agencyModeFk = vAgencyModeFk
|
||||||
AND ait.itemTypeFk = itt.id
|
AND ait.itemTypeFk = itt.id
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT i.id
|
||||||
|
FROM item i
|
||||||
|
JOIN priceDelta pd
|
||||||
|
ON pd.itemTypeFk = i.typeFk
|
||||||
|
AND (pd.minSize IS NULL OR pd.minSize <= i.`size`)
|
||||||
|
AND (pd.maxSize IS NULL OR pd.maxSize >= i.`size`)
|
||||||
|
AND (pd.inkFk IS NULL OR pd.inkFk = i.inkFk)
|
||||||
|
AND (pd.originFk IS NULL OR pd.originFk = i.originFk)
|
||||||
|
AND (pd.producerFk IS NULL OR pd.producerFk = i.producerFk)
|
||||||
|
AND (pd.warehouseFk IS NULL OR pd.warehouseFk = vWarehouseFk)
|
||||||
|
LEFT JOIN zoneGeo zg ON zg.id = pd.zoneGeoFk
|
||||||
|
LEFT JOIN zoneGeo zg2 ON zg2.id = address_getGeo(vAddressFk)
|
||||||
|
WHERE (pd.fromDated IS NULL OR pd.fromDated <= vShipped)
|
||||||
|
AND (pd.toDated IS NULL OR pd.toDated >= vShipped)
|
||||||
|
AND (pd.zoneGeoFk IS NULL OR zg2.lft BETWEEN zg.lft AND zg.rgt)
|
||||||
|
AND pd.isHidden
|
||||||
|
GROUP BY i.id) pd ON pd.id = i.itemFk
|
||||||
WHERE a.calc_id = vAvailableCalc
|
WHERE a.calc_id = vAvailableCalc
|
||||||
AND a.available > 0
|
AND a.available > 0
|
||||||
AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
|
AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
|
||||||
|
@ -132,7 +150,8 @@ BEGIN
|
||||||
it.size <= z.itemMaxSize OR z.itemMaxSize IS NULL))
|
it.size <= z.itemMaxSize OR z.itemMaxSize IS NULL))
|
||||||
AND cit.id IS NULL
|
AND cit.id IS NULL
|
||||||
AND zit.id IS NULL
|
AND zit.id IS NULL
|
||||||
AND ait.id IS NULL;
|
AND ait.id IS NULL
|
||||||
|
AND pd.id IS NULL;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tmp.buyUltimate;
|
DROP TEMPORARY TABLE tmp.buyUltimate;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
ALTER TABLE vn.priceDelta ADD IF NOT EXISTS isHidden BOOL
|
||||||
|
DEFAULT FALSE NOT NULL
|
||||||
|
COMMENT 'Hides the itemType when building de catalog recordset';
|
Loading…
Reference in New Issue