Merge branch 'ticket-14161-UncombinableSale' into develop
This commit is contained in:
Marion Muszynski
commit
cf246105b7
@ -3,209 +3,283 @@ require 'BusinessDaysCalculator.php';
|
||||
|
||||
if (!class_exists('SaleDelay')) {
|
||||
|
||||
class SaleDelay {
|
||||
class SaleDelay {
|
||||
|
||||
public static function associateDelay($products)
|
||||
{
|
||||
global $cookie;
|
||||
public static function associateDelay($products)
|
||||
{
|
||||
global $cookie;
|
||||
|
||||
// products cart group by delay
|
||||
$products_final = array();
|
||||
$categories_cached = array();
|
||||
$sales_cached = array();
|
||||
// products cart group by delay
|
||||
$products_final = array();
|
||||
$categories_cached = array();
|
||||
$sales_cached = array();
|
||||
|
||||
foreach ($products as $key => $product) {
|
||||
if (!isset($product['id_category_default'])) {
|
||||
$product['id_category_default'] = Db::getInstance()->getValue('
|
||||
SELECT `id_category_default`
|
||||
FROM `ps_product`
|
||||
WHERE `id_product` = '.(int)$product['product_id'] .'
|
||||
');
|
||||
}
|
||||
foreach ($products as $key => $product) {
|
||||
if (!isset($product['id_category_default'])) {
|
||||
$product['id_category_default'] = Db::getInstance()->getValue('
|
||||
SELECT `id_category_default`
|
||||
FROM `ps_product`
|
||||
WHERE `id_product` = '.(int)$product['product_id'] .'
|
||||
');
|
||||
}
|
||||
|
||||
if (!in_array($product['id_category_default'], $categories_cached)) {
|
||||
$sale = Sale::getSaleFromCategory((int) $product['id_category_default']);
|
||||
$sales_cached[(int) $product['id_category_default']] = $sale;
|
||||
} else {
|
||||
$sale = $sales_cached[(int) $product['id_category_default']];
|
||||
}
|
||||
$delay = !empty($sale->delivery_delay) ? $sale->delivery_delay : 1;
|
||||
if (!in_array($product['id_category_default'], $categories_cached)) {
|
||||
$sale = Sale::getSaleFromCategory((int) $product['id_category_default']);
|
||||
$sales_cached[(int) $product['id_category_default']] = $sale;
|
||||
} else {
|
||||
$sale = $sales_cached[(int) $product['id_category_default']];
|
||||
}
|
||||
$delay = !empty($sale->delivery_delay) ? $sale->delivery_delay : 1;
|
||||
|
||||
if(!isset($products_final[(int)$delay])) {
|
||||
$products_final[(int)$delay] = array();
|
||||
$array_delay = self::getDelay($delay, $cookie->id_lang);
|
||||
if(!isset($products_final[(int)$delay])) {
|
||||
$products_final[(int)$delay] = array();
|
||||
$array_delay = self::getDelay($delay, $cookie->id_lang);
|
||||
|
||||
$products_final[(int)$delay]['title'] = $array_delay['short_name'];
|
||||
$products_final[(int)$delay]['products'] = array();
|
||||
}
|
||||
$products_final[(int)$delay]['title'] = $array_delay['short_name'];
|
||||
$products_final[(int)$delay]['products'] = array();
|
||||
}
|
||||
|
||||
$products_final[(int)$delay]['products'][] = $product;
|
||||
}
|
||||
$products_final[(int)$delay]['products'][] = $product;
|
||||
}
|
||||
|
||||
return $products_final;
|
||||
}
|
||||
return $products_final;
|
||||
}
|
||||
|
||||
public static function getDeliveryDate(array $delays, $id_lang = null, $date_calcul = null, $include_we =false)
|
||||
{
|
||||
global $cookie;
|
||||
if (!$date_calcul) {
|
||||
$date_calcul = new DateTime();
|
||||
}
|
||||
if (!$id_lang) {
|
||||
$id_lang = $cookie->id_lang;
|
||||
}
|
||||
if (empty($delays)) {
|
||||
return false;
|
||||
}
|
||||
public static function getDeliveryDate(array $delays, $id_lang = null, $date_calcul = null, $include_we =false)
|
||||
{
|
||||
global $cookie;
|
||||
if (!$date_calcul) {
|
||||
$date_calcul = new DateTime();
|
||||
}
|
||||
if (!$id_lang) {
|
||||
$id_lang = $cookie->id_lang;
|
||||
}
|
||||
if (empty($delays)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$delivery_date = array();
|
||||
foreach ($delays as $key => $delay) {
|
||||
if (!in_array($delay, array_keys($delivery_date))) {
|
||||
$delivery_date[$delay] = self::getDayDelay($delay, $cookie->id_lang);
|
||||
$delivery_date[$delay]['date_start'] = self::getDateWithDelay((int)$delivery_date[$delay]['value'], $date_calcul, $include_we);
|
||||
$delivery_date = array();
|
||||
foreach ($delays as $key => $delay) {
|
||||
if (!in_array($delay, array_keys($delivery_date))) {
|
||||
$delivery_date[$delay] = self::getDayDelay($delay, $cookie->id_lang);
|
||||
$delivery_date[$delay]['date_start'] = self::getDateWithDelay((int)$delivery_date[$delay]['value'], $date_calcul, $include_we);
|
||||
|
||||
// exception noel
|
||||
if ($delay == 5) {
|
||||
$delivery_date[$delay]['date_end'] = self::getDateWithDelay((int) $delivery_date[$delay]['value'], $date_calcul, $include_we);
|
||||
} else {
|
||||
$delivery_date[$delay]['date_end'] = self::getDateWithDelay((int) $delivery_date[$delay]['value_max'], $date_calcul, $include_we);
|
||||
}
|
||||
// exception noel
|
||||
if ($delay == 5) {
|
||||
$delivery_date[$delay]['date_end'] = self::getDateWithDelay((int) $delivery_date[$delay]['value'], $date_calcul, $include_we);
|
||||
} else {
|
||||
$delivery_date[$delay]['date_end'] = self::getDateWithDelay((int) $delivery_date[$delay]['value_max'], $date_calcul, $include_we);
|
||||
}
|
||||
|
||||
if ($delay != 5) {
|
||||
$diff = (int)$delivery_date[$delay]['value_max'] - (int)$delivery_date[$delay]['value'];
|
||||
$interval = $delivery_date[$delay]['date_end']->diff($delivery_date[$delay]['date_start']);
|
||||
if((int)$diff != (int)$interval->format('%a')){
|
||||
$day_to_add = (int)$diff - (int)$interval->format('%a');
|
||||
if($day_to_add>1){
|
||||
$delivery_date[$delay]['date_end'] = $delivery_date[$delay]['date_end']->modify('+'.$day_to_add.' days');
|
||||
}else{
|
||||
$delivery_date[$delay]['date_end'] = $delivery_date[$delay]['date_end']->modify('+'.$day_to_add.' day');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return $delivery_date;
|
||||
}
|
||||
if ($delay != 5) {
|
||||
$diff = (int)$delivery_date[$delay]['value_max'] - (int)$delivery_date[$delay]['value'];
|
||||
$interval = $delivery_date[$delay]['date_end']->diff($delivery_date[$delay]['date_start']);
|
||||
if((int)$diff != (int)$interval->format('%a')){
|
||||
$day_to_add = (int)$diff - (int)$interval->format('%a');
|
||||
if($day_to_add>1){
|
||||
$delivery_date[$delay]['date_end'] = $delivery_date[$delay]['date_end']->modify('+'.$day_to_add.' days');
|
||||
}else{
|
||||
$delivery_date[$delay]['date_end'] = $delivery_date[$delay]['date_end']->modify('+'.$day_to_add.' day');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return $delivery_date;
|
||||
}
|
||||
|
||||
public static function getDateWithDelay($nb_day, $date, $include_we = false)
|
||||
{
|
||||
public static function getDateWithDelay($nb_day, $date, $include_we = false)
|
||||
{
|
||||
|
||||
if ($include_we) {
|
||||
$calculator = new BusinessDaysCalculator(
|
||||
new DateTime($date->format('Y-m-d H:i:s')),
|
||||
array(),
|
||||
[BusinessDaysCalculator::SUNDAY]
|
||||
);
|
||||
$calculator->addDaysWithCheckLastDay($nb_day);
|
||||
} else {
|
||||
$calculator = new BusinessDaysCalculator(
|
||||
new DateTime($date->format('Y-m-d H:i:s')),
|
||||
array(),
|
||||
[BusinessDaysCalculator::SATURDAY, BusinessDaysCalculator::SUNDAY]
|
||||
);
|
||||
$calculator->addBusinessDays($nb_day);
|
||||
}
|
||||
if ($include_we) {
|
||||
$calculator = new BusinessDaysCalculator(
|
||||
new DateTime($date->format('Y-m-d H:i:s')),
|
||||
array(),
|
||||
[BusinessDaysCalculator::SUNDAY]
|
||||
);
|
||||
$calculator->addDaysWithCheckLastDay($nb_day);
|
||||
} else {
|
||||
$calculator = new BusinessDaysCalculator(
|
||||
new DateTime($date->format('Y-m-d H:i:s')),
|
||||
array(),
|
||||
[BusinessDaysCalculator::SATURDAY, BusinessDaysCalculator::SUNDAY]
|
||||
);
|
||||
$calculator->addBusinessDays($nb_day);
|
||||
}
|
||||
|
||||
return $calculator->getDate();
|
||||
}
|
||||
return $calculator->getDate();
|
||||
}
|
||||
|
||||
public static function getDayDelay($id_delay, $id_lang)
|
||||
{
|
||||
return Db::getInstance()->getRow('
|
||||
SELECT `value`, `value_max`, `name`
|
||||
FROM `ps_privatesale_delay_lang`
|
||||
WHERE `id_delay` = '.(int) $id_delay.'
|
||||
AND `id_lang` = '.(int) $id_lang.'
|
||||
');
|
||||
}
|
||||
public static function getDayDelay($id_delay, $id_lang)
|
||||
{
|
||||
return Db::getInstance()->getRow('
|
||||
SELECT `value`, `value_max`, `name`
|
||||
FROM `ps_privatesale_delay_lang`
|
||||
WHERE `id_delay` = '.(int) $id_delay.'
|
||||
AND `id_lang` = '.(int) $id_lang.'
|
||||
');
|
||||
}
|
||||
|
||||
public static function getDelay($id_delay, $id_lang)
|
||||
{
|
||||
return Db::getInstance()->getRow('
|
||||
SELECT d.`id_delay`, dl.`name`, dl.`short_name`, dl.`value`
|
||||
FROM `'._DB_PREFIX_.'privatesale_delay_lang` d
|
||||
LEFT JOIN `'._DB_PREFIX_.'privatesale_delay_lang` dl ON (d.`id_delay` = dl.`id_delay`)
|
||||
WHERE dl.`id_lang` = '.(int) $id_lang.'
|
||||
AND d.`id_delay` = '.(int) $id_delay.'
|
||||
');
|
||||
}
|
||||
public static function getDelay($id_delay, $id_lang)
|
||||
{
|
||||
return Db::getInstance()->getRow('
|
||||
SELECT d.`id_delay`, dl.`name`, dl.`short_name`, dl.`value`
|
||||
FROM `'._DB_PREFIX_.'privatesale_delay_lang` d
|
||||
LEFT JOIN `'._DB_PREFIX_.'privatesale_delay_lang` dl ON (d.`id_delay` = dl.`id_delay`)
|
||||
WHERE dl.`id_lang` = '.(int) $id_lang.'
|
||||
AND d.`id_delay` = '.(int) $id_delay.'
|
||||
');
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo - remove this function to use short name
|
||||
*/
|
||||
public static function getDelaySmallName($id_delay, $id_lang) {
|
||||
if($id_lang == 2) {
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return 'Classique';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7j';
|
||||
break;
|
||||
case '4':
|
||||
return '10j';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '8':
|
||||
return '48h Noël';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
default:
|
||||
return 'Inconnu';
|
||||
break;
|
||||
}
|
||||
} elseif($id_lang == 3){
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return 'Classic';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7j';
|
||||
break;
|
||||
case '4':
|
||||
return '10j';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
case '8':
|
||||
return '48h Noël';
|
||||
break;
|
||||
default:
|
||||
return 'Unknown';
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 'Unknown';
|
||||
}
|
||||
/**
|
||||
* @todo - remove this function to use short name
|
||||
*/
|
||||
public static function getDelaySmallName($id_delay, $id_lang) {
|
||||
if($id_lang == 2) {
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return 'Classique';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7j';
|
||||
break;
|
||||
case '4':
|
||||
return '10j';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '8':
|
||||
return '48h Noël';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
default:
|
||||
return 'Inconnu';
|
||||
break;
|
||||
}
|
||||
} elseif($id_lang == 3){
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return 'Classic';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7j';
|
||||
break;
|
||||
case '4':
|
||||
return '10j';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
case '8':
|
||||
return '48h Noël';
|
||||
break;
|
||||
default:
|
||||
return 'Unknown';
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 'Unknown';
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* @todo - remove this function to use short name
|
||||
*/
|
||||
public static function getDelayFrontSmallName($id_delay, $id_lang) {
|
||||
if($id_lang == 2) {
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return '3 semaines';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7 jours';
|
||||
break;
|
||||
case '4':
|
||||
return '10 jours';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '8':
|
||||
return '48h';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
default:
|
||||
return 'quelques jours';
|
||||
break;
|
||||
}
|
||||
} elseif($id_lang == 3){
|
||||
switch ($id_delay) {
|
||||
case '1':
|
||||
return '3 semanas';
|
||||
break;
|
||||
case '2':
|
||||
return '48h';
|
||||
break;
|
||||
case '3':
|
||||
return '7 días';
|
||||
break;
|
||||
case '4':
|
||||
return '10 días';
|
||||
break;
|
||||
case '5':
|
||||
return 'Noël';
|
||||
break;
|
||||
case '6':
|
||||
return 'Star';
|
||||
break;
|
||||
case '7':
|
||||
return '72h';
|
||||
break;
|
||||
case '9':
|
||||
return 'Spé';
|
||||
break;
|
||||
case '8':
|
||||
return '48h';
|
||||
break;
|
||||
default:
|
||||
return 'un poco días';
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 'few days';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
*/
|
||||
|
||||
include_once dirname(__FILE__).'/../../modules/privatesales/Sale.php';
|
||||
include_once dirname(__FILE__).'/../../modules/privatesales_delay/saledelay.php';
|
||||
class CartController extends CartControllerCore
|
||||
{
|
||||
public function preProcess()
|
||||
@ -80,20 +81,22 @@ class CartController extends CartControllerCore
|
||||
|
||||
if (!empty($current_sale)) {
|
||||
global $smarty;
|
||||
$current_delay_name = SaleDelay::getDelayFrontSmallName($current_sale['delivery_delay'], self::$cookie->id_lang);
|
||||
$adding_delay_name = SaleDelay::getDelayFrontSmallName($adding_sale['delivery_delay'], self::$cookie->id_lang));
|
||||
if ((int)$current_sale['delivery_delay'] == 1 && !Sale::isCombinable($current_sale,$adding_sale)){
|
||||
// Product in cart comes from classic delivery sale
|
||||
if (Tools::getValue('ajax') == 'true') {
|
||||
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within 3 weeks. To continue, please confirm your order or empty your cart.', false).'"]}');
|
||||
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.sprintf(Tools::displayError('Sorry your cart already contains products from a sale shipped within %s. To continue, please confirm your order or empty your cart.', false), $current_delay_name).'"]}');
|
||||
} else {
|
||||
$this->errors[] = Tools::displayError('Sorry your cart already contains products from a sale shipped within 3 weeks. To continue, please confirm your order or empty your cart.', false);
|
||||
$this->errors[] = sprintf(Tools::displayError('Sorry your cart already contains products from a sale shipped within %s. To continue, please confirm your order or empty your cart.', false),$current_delay_name);
|
||||
}
|
||||
}
|
||||
elseif (!Sale::isCombinable($current_sale,$adding_sale)){
|
||||
// Product in cart comes from special delivery sale
|
||||
if (Tools::getValue('ajax') == 'true') {
|
||||
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false).'"]}');
|
||||
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.sprintf(Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. We cannot add products from sales shipped within %s. To continue, please confirm your order or empty your cart.', false),$adding_delay_name).'"]}');
|
||||
} else {
|
||||
$this->errors[] = Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false);
|
||||
$this->errors[] = sprintf(Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. We cannot add products from sales shipped within %s. To continue, please confirm your order or empty your cart.', false),$adding_delay_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user