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

// Context part 27

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-29 14:29:57 +00:00
parent 35748d1b8f
commit 5d090a25b3
66 changed files with 532 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dateofdelivery/dateofdelivery.php
+3 -6
View File
@@ -98,7 +98,6 @@ class DateOfDelivery extends Module
public function hookBeforeCarrier($params)
{
$context = Context::getContext();
if (!sizeof($params['carriers']))
return false;
@@ -111,7 +110,7 @@ class DateOfDelivery extends Module
foreach ($params['carriers'] as $carrier)
$datesDelivery[(int)($carrier['id_carrier'])] = $this->_getDatesOfDelivery((int)($carrier['id_carrier']), $oos);
$context->smarty->assign(array(
$this->context->smarty->assign(array(
'datesDelivery' => $datesDelivery,
'id_carrier' => ($params['cart']->id_carrier ? (int)($params['cart']->id_carrier) : (int)(Configuration::get('PS_CARRIER_DEFAULT')))
));
@@ -121,7 +120,6 @@ class DateOfDelivery extends Module
public function hookOrderDetailDisplayed($params)
{
$context = Context::getContext();
$oos = false; // For out of stock management
foreach ($params['order']->getProducts() as $product)
@@ -134,7 +132,7 @@ class DateOfDelivery extends Module
if (!is_array($datesDelivery) OR !sizeof($datesDelivery))
return ;
$context->smarty->assign('datesDelivery', $datesDelivery);
$this->context->smarty->assign('datesDelivery', $datesDelivery);
return $this->display(__FILE__, 'orderDetail.tpl');
}
@@ -312,9 +310,8 @@ class DateOfDelivery extends Module
private function _setCarrierRuleForm()
{
$context = Context::getContext();
$carriers = Carrier::getCarriers($context->language->id, true , false,false, NULL, ALL_CARRIERS);
$carriers = Carrier::getCarriers($this->context->language->id, true , false,false, NULL, ALL_CARRIERS);
if (Tools::isSubmit('editCarrierRule') AND $this->_isCarrierRuleExists(Tools::getValue('id_carrier_rule')))
$carrier_rule = $this->_getCarrierRule(Tools::getValue('id_carrier_rule'));