Regression fix: remove custom shipping calculator which causes exp to…

… crash in ecommerce; add note to fix this programatically
exponentcms · Apr 17, 2015 · 48fb3d8 · 48fb3d8
1 parent 135af31
commit 48fb3d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/framework/modules/ecommerce/controllers/storeController.php b/framework/modules/ecommerce/controllers/storeController.php
@@ -1237,6 +1237,7 @@ function edit() {
 //        $shipping = new shipping();
 //        foreach (shipping::listAvailableCalculators() as $calcid => $name) {
         foreach (shipping::listCalculators() as $calcid => $name) {
+            //FIXME must make sure (custom) calculator exists
             $calc = new $name($calcid);
             $shipping_services[$calcid] = $calc->title;
             $shipping_methods[$calcid] = $calc->availableMethods();

diff --git a/install/samples/store.eql b/install/samples/store.eql
@@ -9861,7 +9861,6 @@ RECORD:O:8:"stdClass":7:{s:2:"id";s:1:"5";s:5:"title";s:6:"Simple";s:4:"body";s:
 RECORD:O:8:"stdClass":7:{s:2:"id";s:1:"6";s:5:"title";s:3:"UPS";s:4:"body";s:89:"Shipping calculator for dynamically calculating shipping rates using the UPS XML Rate API";s:15:"calculator_name";s:13:"upscalculator";s:7:"enabled";s:1:"0";s:10:"is_default";s:1:"0";s:6:"config";s:0:"";}
 RECORD:O:8:"stdClass":7:{s:2:"id";s:1:"7";s:5:"title";s:8:"Per Item";s:4:"body";s:34:"Per item based shipping calculator";s:15:"calculator_name";s:17:"peritemcalculator";s:7:"enabled";s:1:"1";s:10:"is_default";s:1:"1";s:6:"config";s:137:"a:4:{s:4:"rate";s:4:"5.00";s:8:"handling";s:0:"";s:21:"shipping_service_name";s:8:"Per Item";s:20:"shipping_method_name";s:8:"Per Item";}";}
 RECORD:O:8:"stdClass":7:{s:2:"id";s:1:"8";s:5:"title";s:10:"Per Weight";s:4:"body";s:36:"Per weight based shipping calculator";s:15:"calculator_name";s:19:"perweightcalculator";s:7:"enabled";s:1:"0";s:10:"is_default";s:1:"0";s:6:"config";s:0:"";}
-RECORD:O:8:"stdClass":7:{s:2:"id";s:1:"9";s:5:"title";s:18:"Table with Charges";s:4:"body";s:29:"Table with Charges calculator";s:15:"calculator_name";s:16:"tablewithcharges";s:7:"enabled";s:1:"0";s:10:"is_default";s:1:"0";s:6:"config";s:0:"";}
 
 TABLE:shippingmethods
 TABLEDEF:a:23:{s:2:"id";a:1:{i:0;i:101;}s:12:"addresses_id";a:1:{i:0;i:101;}s:9:"firstname";a:2:{i:0;i:102;i:1;i:100;}s:10:"middlename";a:2:{i:0;i:102;i:1;i:100;}s:8:"lastname";a:2:{i:0;i:102;i:1;i:100;}s:12:"organization";a:2:{i:0;i:102;i:1;i:100;}s:8:"address1";a:2:{i:0;i:102;i:1;i:150;}s:8:"address2";a:2:{i:0;i:102;i:1;i:150;}s:4:"city";a:2:{i:0;i:102;i:1;i:100;}s:5:"state";a:2:{i:0;i:102;i:1;i:2;}s:12:"non_us_state";a:2:{i:0;i:102;i:1;i:100;}s:3:"zip";a:2:{i:0;i:102;i:1;i:10;}s:7:"country";a:2:{i:0;i:102;i:1;i:50;}s:5:"phone";a:2:{i:0;i:102;i:1;i:20;}s:5:"email";a:2:{i:0;i:102;i:1;i:150;}s:21:"shippingcalculator_id";a:1:{i:0;i:101;}s:6:"option";a:2:{i:0;i:102;i:1;i:50;}s:12:"option_title";a:2:{i:0;i:102;i:1;i:100;}s:13:"shipping_cost";a:1:{i:0;i:106;}s:2:"to";a:2:{i:0;i:102;i:1;i:100;}s:4:"from";a:2:{i:0;i:102;i:1;i:100;}s:7:"message";a:2:{i:0;i:102;i:1;i:65535;}s:7:"carrier";a:2:{i:0;i:102;i:1;i:100;}}