[-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date

This commit is contained in:
gRoussac
2013-11-25 17:39:46 +01:00
parent 2b0224efe1
commit a0373eed7a
+3 -5
View File
@@ -128,13 +128,12 @@ class DateOfDelivery extends Module
$package = $package_list[$id_address][$id_package];
$oos = false; // For out of stock management
foreach ($package['product_list'] as $product)
if (StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']) <= 0)
if (StockAvailable::getQuantityAvailableByProduct($product['id_product'], ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), (int)$this->context->shop->id) <= 0)
{
$oos = true;
break;
}
$available_date = Product::getAvailableDate($product['id_product'], $product['id_product_attribute']);
$available_date = Product::getAvailableDate($product['id_product'], ($product['id_product_attribute'] ? (int)$product['id_product_attribute'] : null), (int)$this->context->shop->id);
$date_range = $this->_getDatesOfDelivery($id_carrier, $oos, $available_date);
if (is_null($date_from) || $date_from < $date_range[0])
{
@@ -150,7 +149,6 @@ class DateOfDelivery extends Module
}
}
}
$this->smarty->assign(array(
'nbPackages' => $params['cart']->getNbOfPackages(),
'datesDelivery' => $datesDelivery,
@@ -708,4 +706,4 @@ class DateOfDelivery extends Module
return $this->display(__FILE__, 'button.tpl').$helper->generateList($list, $fields_list).$this->display(__FILE__, 'button.tpl');
}
}
}