db/routines/vn/procedures/catalog_calculate.sql

@@ -78,7 +78,6 @@ BEGIN
 		END IF;
 
 		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vAvailabled);
-		-- CALL `cache`.availableNoRaids_refresh(vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
 		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 
 		INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
@@ -88,31 +87,10 @@ BEGIN
 					bu.buyFk,
 					vZoneFk
 				FROM `cache`.available a
-					-- LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id 
-					--									AND anr.calc_id = vAvailableNoRaidsCalc
 					JOIN tmp.item i ON i.itemFk = a.item_id
 					JOIN item it ON it.id = i.itemFk
 					JOIN `zone` z ON z.id = vZoneFk
 					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id	
-				/*	LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk	
-					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID 
-					LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-					LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
-									FROM addressFilter af
-										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed 
-												FROM address ad 
-													JOIN province p ON p.id = ad.provinceFk 
-												WHERE ad.id = vAddressFk
-											) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
-													AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
-													AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
-								WHERE vWarehouseFk = af.warehouseFk
-									AND (vShipped < af.beforeDated
-										OR ISNULL(af.beforeDated)
-										OR	vShipped > af.afterDated
-										OR ISNULL(af.afterDated))
-								) sub ON sub.isVNHSupplier = v.isVNHSupplier
-										AND (sub.isEarlyBird = mp.isEarlyBird OR ISNULL(sub.isEarlyBird)) */
 					JOIN agencyMode am ON am.id = vAgencyModeFk
 					JOIN agency ag ON ag.id = am.agencyFk
 					JOIN itemType itt ON itt.id = it.typeFk
@@ -129,7 +107,6 @@ BEGIN
 							AND ait.itemTypeFk = itt.id
 				WHERE a.calc_id = vAvailableCalc
 					AND a.available > 0
-					-- AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
 					AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
 					AND (it.`size` IS NULL
 						OR IF(itc.isReclining,