[interchange-cvs] interchange - edl modified 3 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Thu Feb 5 18:03:39 EST 2004
User: edl
Date: 2004-02-05 23:03:39 GMT
Modified: dist/foundation/products shipping.asc variable.txt
Modified: mv_metadata.asc
Log:
Mods to these table supply framework for making use of the modulo feature
for UPS shipments. Two new catalog variables enable/disable the feature
and set the modulus, respectively. Dist defaults maintain the 'one big box'
assumption that has been there all along, but now alternatives are somewhat
easier to implement
Revision Changes Path
2.2 +19 -19 interchange/dist/foundation/products/shipping.asc
rev 2.2, prev_rev 2.1
Index: shipping.asc
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/shipping.asc,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- shipping.asc 20 Feb 2003 03:08:41 -0000 2.1
+++ shipping.asc 5 Feb 2004 23:03:38 -0000 2.2
@@ -1,59 +1,59 @@
1DM UPS Next Day Air Early AM weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DM", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DM UPS Next Day Air Early AM weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DM" weight="@@TOTAL@@"]
+1DM UPS Next Day Air Early AM weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DM" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
1DML UPS Next Day Air Early AM Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DML", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DML UPS Next Day Air Early AM Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DML" weight="@@TOTAL@@"]
+1DML UPS Next Day Air Early AM Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DML" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
1DA UPS Next Day Air weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DA", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DA UPS Next Day Air weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DA" weight="@@TOTAL@@"]
+1DA UPS Next Day Air weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DA" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
1DAL UPS Next Day Air Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DAL", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DAL UPS Next Day Air Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DAL" weight="@@TOTAL@@"]
+1DAL UPS Next Day Air Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DAL" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
1DP UPS Next Day Air Saver weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DP", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DP UPS Next Day Air Saver weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DP" weight="@@TOTAL@@"]
+1DP UPS Next Day Air Saver weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DP" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
1DPL UPS Next Day Air Saver Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:1DPL", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-1DPL UPS Next Day Air Saver Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DPL" weight="@@TOTAL@@"]
+1DPL UPS Next Day Air Saver Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="1DPL" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
2DM UPS 2nd Day Air A.M. weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:2DM", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-2DM UPS 2nd Day Air A.M. weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DM" weight="@@TOTAL@@"]
+2DM UPS 2nd Day Air A.M. weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DM" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
2DA UPS 2nd Day Air weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:2DA", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-2DA UPS 2nd Day Air weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DA" weight="@@TOTAL@@"]
+2DA UPS 2nd Day Air weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DA" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
2DML UPS 2nd Day Air A.M. Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:2DML", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-2DML UPS 2nd Day Air A.M. Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DML" weight="@@TOTAL@@"]
+2DML UPS 2nd Day Air A.M. Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DML" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
2DAL UPS 2nd Day Air Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:2DAL", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-2DAL UPS 2nd Day Air Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DAL" weight="@@TOTAL@@"]
+2DAL UPS 2nd Day Air Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="2DAL" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
3DS UPS 3 Day Select weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:3DS", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-3DS UPS 3 Day Select weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="3DS" weight="@@TOTAL@@"]
+3DS UPS 3 Day Select weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="3DS" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
GNDCOM UPS Ground Commercial weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:GNDCOM", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-GNDCOM UPS Ground Commercial weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="GNDCOM" weight="@@TOTAL@@"]
+GNDCOM UPS Ground Commercial weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="GNDCOM" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
GNDRES UPS Ground Residential weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:GNDRES", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-GNDRES UPS Ground Residential weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="GNDRES" weight="@@TOTAL@@"]
+GNDRES UPS Ground Residential weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="GNDRES" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
XPR UPS Worldwide Express weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:XPR", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-XPR UPS Worldwide Express weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPR" weight="@@TOTAL@@"]
+XPR UPS Worldwide Express weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPR" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
XDM UPS Worldwide Express Plus weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:XDM", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-XDM UPS Worldwide Express Plus weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XDM" weight="@@TOTAL@@"]
+XDM UPS Worldwide Express Plus weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XDM" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
XPRL UPS Worldwide Express Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:XPRL", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-XPRL UPS Worldwide Express Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPRL" weight="@@TOTAL@@"]
+XPRL UPS Worldwide Express Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPRL" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
XDML UPS Worldwide Express Plus Letter weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:XDML", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-XDML UPS Worldwide Express Plus Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XDML" weight="@@TOTAL@@"]
+XDML UPS Worldwide Express Plus Letter weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XDML" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
XPD UPS Worldwide Expedited weight 0 0 e Nothing to ship! { 'ui_ship_type' => "UPSE:XPD", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-XPD UPS Worldwide Expedited weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPD" weight="@@TOTAL@@"]
+XPD UPS Worldwide Expedited weight 0 150 f [ups-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="XPD" weight="@@TOTAL@@" aggregate="[var UPS_QUERY_AGGREGATE]"]
FEG FedEx Ground weight 0 0 e Nothing to ship! { 'ui_ship_type' => "FEDE:FEG", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
-FEG FedEx Ground weight 0 150 f [fedex-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="FEG" cache=1 weight="@@TOTAL@@"]
+FEG FedEx Ground weight 0 150 f [fedex-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="FEG" cache=1 weight="@@TOTAL@@"]Q
FEH FedEx Home Delivery weight 0 0 e Nothing to ship! { 'ui_ship_type' => "FEDE:FEH", 'ups' => "0", 'at_least' => "5", adder => "3.00" }
FEH FedEx Home Delivery weight 0 150 f [fedex-query zip="[either][value zip][or][var SHIP_DEFAULT_ZIP][/either]" mode="FEH" cache=1 weight="@@TOTAL@@"]
2.33 +2 -0 interchange/dist/foundation/products/variable.txt
rev 2.33, prev_rev 2.32
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/variable.txt,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -r2.32 -r2.33
--- variable.txt 27 Jul 2003 04:30:54 -0000 2.32
+++ variable.txt 5 Feb 2004 23:03:38 -0000 2.33
@@ -98,3 +98,5 @@
UPS_COUNTRY_FIELD country Shipping
UPS_ORIGIN __MVC_UPSORIGIN__ Shipping
UPS_POSTCODE_FIELD zip Shipping
+UPS_QUERY_AGGREGATE 1 Shipping
+UPS_QUERY_MODULO 150 Shipping
2.45 +2 -0 interchange/dist/foundation/products/mv_metadata.asc
rev 2.45, prev_rev 2.44
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/mv_metadata.asc,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -r2.44 -r2.45
--- mv_metadata.asc 15 Jan 2004 23:10:09 -0000 2.44
+++ mv_metadata.asc 5 Feb 2004 23:03:38 -0000 2.45
@@ -416,3 +416,5 @@
variants::sku text BaseSKU
variants::weight text 8 Weight digits_dot
variants::wholesale text 12 Dealer Price digits_dot
+variable::Variable::UPS_QUERY_AGGREGATE text 4 If set to 1, the UPS shipment will be treated as a group of boxes, each weighing the value of UPS_QUERY_MODULO (default is 150). The charge for the modulo weight is mutliplied by the number of times necessary, then a charge is obtained remainder and added to the running total.
<p>
If set to a number above 10, will be the modulo to do repeated calls by.
<p>
0 or blank disables the modulo feature. perldoc VENDROOT/code/UserTag/ups_query.tag for more information. {}
+variable::Variable::UPS_QUERY_MODULO text 4 The modulus for UPS modulo shipping calculations. See UPS_QUERY_AGGREGATE variable. {}
More information about the interchange-cvs
mailing list