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

[-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date

Browse Source
This commit is contained in:
Jérôme Nadaud
2013-07-26 11:48:18 +02:00
parent e80364984a
commit 23e0467993
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dateofdelivery/dateofdelivery.php
+6 -5
View File
@@ -128,8 +128,9 @@ class DateOfDelivery extends Module
$oos = true;
break;
}
$date_range = $this->_getDatesOfDelivery($id_carrier, $oos);
$available_date = Product::getAvailableDate($product['id_product'], $product['id_product_attribute']);
$date_range = $this->_getDatesOfDelivery($id_carrier, $oos, $available_date);
if (is_null($date_from) || $date_from < $date_range[0])
{
$date_from = $date_range[0][1];
@@ -493,9 +494,9 @@ class DateOfDelivery extends Module
}
/**
* @param $id_carrier
* @param bool $product_oos
* @param null $date
* @param int $id_carrier
* @param bool $product_oos
* @param string $date
*
* @return array|bool returns the min & max delivery date
*/