dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix module tab dispatch

Browse Source
This commit is contained in:
tDidierjean
2011-11-18 14:10:23 +00:00
parent 5c47836cee
commit 54b80f48e4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+12 -9
View File
@@ -50,6 +50,9 @@ class CarrierCore extends ObjectModel
/** @var int Tax id (none = 0) */ /** @var int Tax id (none = 0) */
public $id_tax_rules_group; public $id_tax_rules_group;
/** @var int common id for carrier historization */
public $id_reference;
/** @var string Name */ /** @var string Name */
public $name; public $name;
@@ -154,12 +157,12 @@ class CarrierCore extends ObjectModel
$fields['external_module_name'] = $this->external_module_name; $fields['external_module_name'] = $this->external_module_name;
$fields['need_range'] = $this->need_range; $fields['need_range'] = $this->need_range;
$fields['position'] = (int)$this->position; $fields['position'] = (int)$this->position;
$fields['id_reference'] = (int)$this->id_reference;
$fields['max_width'] = (int)$this->max_width; $fields['max_width'] = (int)$this->max_width;
$fields['max_height'] = (int)$this->max_height; $fields['max_height'] = (int)$this->max_height;
$fields['max_depth'] = (int)$this->max_depth; $fields['max_depth'] = (int)$this->max_depth;
$fields['max_weight'] = (int)$this->max_weight; $fields['max_weight'] = (int)$this->max_weight;
$fields['grade'] = (int)$this->grade; $fields['grade'] = (int)$this->grade;
return $fields; return $fields;
} }
@@ -1015,10 +1018,10 @@ class CarrierCore extends ObjectModel
$position = DB::getInstance()->getValue($sql); $position = DB::getInstance()->getValue($sql);
return ($position !== false) ? $position : -1; return ($position !== false) ? $position : -1;
} }
/** /**
* For a given {product, warehouse}, gets the carrier available * For a given {product, warehouse}, gets the carrier available
* *
* @param $product integer The id of the product, or an array with at least the package size and weight * @param $product integer The id of the product, or an array with at least the package size and weight
*/ */
public static function getAvailableCarrierList($product, $id_warehouse, $id_shop = null) public static function getAvailableCarrierList($product, $id_warehouse, $id_shop = null)
@@ -1030,10 +1033,10 @@ class CarrierCore extends ObjectModel
$product['id'] = $product['id_product']; $product['id'] = $product['id_product'];
$product = (object)$product; $product = (object)$product;
} }
if (is_null($id_shop)) if (is_null($id_shop))
$id_shop = Context::getContext()->shop->getID(true); $id_shop = Context::getContext()->shop->getID(true);
// Does the product is linked with carriers? // Does the product is linked with carriers?
$query = new DbQuery(); $query = new DbQuery();
$query->select('id_carrier'); $query->select('id_carrier');
@@ -1049,9 +1052,9 @@ class CarrierCore extends ObjectModel
$carrier_list[] = $carrier['id_carrier']; $carrier_list[] = $carrier['id_carrier'];
return $carrier_list; return $carrier_list;
} }
$carrier_list = array(); $carrier_list = array();
// The product is not dirrectly linked with a carrier // The product is not dirrectly linked with a carrier
// Get all the carriers linked to a warehouse // Get all the carriers linked to a warehouse
if ($id_warehouse) if ($id_warehouse)
@@ -1059,7 +1062,7 @@ class CarrierCore extends ObjectModel
$warehouse = new Warehouse($id_warehouse); $warehouse = new Warehouse($id_warehouse);
$carrier_list = $warehouse->getCarriers(); $carrier_list = $warehouse->getCarriers();
} }
if (empty($carrier_list)) // No carriers defined, get all available carriers if (empty($carrier_list)) // No carriers defined, get all available carriers
{ {
$carrier_list = array(); $carrier_list = array();
@@ -1070,7 +1073,7 @@ class CarrierCore extends ObjectModel
foreach ($carriers as $carrier) foreach ($carriers as $carrier)
$carrier_list[] = $carrier['id_carrier']; $carrier_list[] = $carrier['id_carrier'];
} }
if ($product->width > 0 || $product->height > 0 || $product->depth > 0 || $product->weight > 0) if ($product->width > 0 || $product->height > 0 || $product->depth > 0 || $product->weight > 0)
{ {
foreach ($carrier_list as $key => $id_carrier) foreach ($carrier_list as $key => $id_carrier)
classes/Dispatcher.php
+1 -1
View File
@@ -307,7 +307,7 @@ class DispatcherCore
$controller_type = 'tab'; $controller_type = 'tab';
} }
// For retrocompatibility with admin/tabs/ old system // For retrocompatibility with admin/tabs/ old system
if (isset($controller_type) && !$controller_type == 'tab') if (isset($controller_type) && $controller_type == 'tab')
{ {
require_once(_PS_ADMIN_DIR_.'/functions.php'); require_once(_PS_ADMIN_DIR_.'/functions.php');
$ajaxMode = !empty($_REQUEST['ajaxMode']); $ajaxMode = !empty($_REQUEST['ajaxMode']);