Merge branch 'ticket-14666-appli-discount' into develop

This commit is contained in:
Michael RICOIS 2017-11-13 11:14:30 +01:00
commit dd3b834e44
2 changed files with 13 additions and 5 deletions

View File

@ -840,10 +840,9 @@ class Cart extends CartCore {
if (!$order_total)
return Tools::displayError('Cannot add voucher if order is free.');
// Ony for API (application)
$subdomain = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], '.'));
if ($subdomain != 'api' && $discountObj->appli == 1) {
return Tools::displayError('This voucher is not valid');
// Only for API (application)
if (!Tools::isApi() && $discountObj->appli == 1) {
return Tools::displayError('This voucher is only valid on the application');
}
if (!$discountObj->active)

View File

@ -128,5 +128,14 @@ class Tools extends ToolsCore {
return true;
}
public static function isApi()
{
$subdomain = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], '.'));
if ($subdomain == 'api') {
return true;
}
return false;
}
}