Merge branch 'develop' into gli-771

This commit is contained in:
abhishek-webkul
2022-07-15 12:34:28 +05:30
committed by GitHub
2758 changed files with 201571 additions and 10437 deletions

View File

@@ -307,7 +307,7 @@ class FrontControllerCore extends Controller
}
if (Validate::isLoadedObject($cart) && $cart->OrderExists()) {
PrestaShopLogger::addLog('Frontcontroller::init - Cart cannot be loaded or a booking has already been placed using this cart', 1, null, 'Cart', (int)$this->context->cookie->id_cart, true);
PrestaShopLogger::addLog('Frontcontroller::init - Cart cannot be loaded or a booking has already been created using this cart', 1, null, 'Cart', (int)$this->context->cookie->id_cart, true);
unset($this->context->cookie->id_cart, $cart, $this->context->cookie->checkedTOS);
$this->context->cookie->check_cgv = false;
}