diff --git a/classes/order/Order.php b/classes/order/Order.php index a4e7a5e6b..dc29f2652 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1804,7 +1804,7 @@ class OrderCore extends ObjectModel SELECT opd.`amount` as `real_paid_amount`, opd.*, op.* FROM `'._DB_PREFIX_.'order_payment_detail` opd INNER JOIN `'._DB_PREFIX_.'order_payment` op ON (opd.`id_order_payment` = op.`id_order_payment`) - WHERE `id_order` = '.$this->id + WHERE `id_order` = '.(int) $this->id ); } diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index 9bf088b58..6708fa987 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.php @@ -85,6 +85,7 @@ class AdminCmsContentControllerCore extends AdminController public function initContent() { + $this->loadObject(true); $this->initTabModuleList(); $this->renderPageHeaderToolbar(); @@ -151,8 +152,9 @@ class AdminCmsContentControllerCore extends AdminController if (Tools::getValue('addcms') !== false) { $this->toolbar_title[] = $this->l('Add new'); - } elseif ($id_cms_page) { - $cms_page = new CMS($id_cms_page); + } elseif ($id_cms_page + && Validate::isLoadedObject($cms_page = new CMS($id_cms_page)) + ) { $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]); } } else { diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index c581d2604..c57d5d807 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -452,10 +452,9 @@ class AdminFeaturesControllerCore extends AdminController $this->initToolbar(); $this->initPageHeaderToolbar(); if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; + if ($this->loadObject(true)) { + $this->content .= $this->renderForm(); } - $this->content .= $this->renderForm(); } elseif ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) { diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 87a959951..6cd378dbf 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -398,6 +398,12 @@ class AdminNormalProductsControllerCore extends AdminController $bo_theme = 'default'; } + Media::addJsDef( + array( + 'tb_pathToImage' => '../img/loadingAnimation.gif' + ) + ); + $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9c6d1fe61..870ac9432 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -482,8 +482,7 @@ class AdminOrdersControllerCore extends AdminController { if ($this->display == 'view') { /** @var Order $order */ - $order = $this->loadObject(); - + $order = new Order(Tools::getValue($this->identifier)); // hotel link in header if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { $this->toolbar_btn['hotel'] = array( @@ -997,7 +996,9 @@ class AdminOrdersControllerCore extends AdminController $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js'); if ($this->tabAccess['edit'] == 1 && $this->display == 'view') { - $this->addJS(_PS_JS_DIR_.'admin/orders.js'); + if ($this->loadObject(true)) { + $this->addJS(_PS_JS_DIR_.'admin/orders.js'); + } // $this->addJS(_PS_JS_DIR_.'admin/orders-product-event.js'); // $this->addJS(_PS_JS_DIR_.'admin/orders-room-event.js'); $this->addJS(_PS_JS_DIR_.'tools.js'); @@ -2477,11 +2478,10 @@ class AdminOrdersControllerCore extends AdminController { $order = new Order(Tools::getValue('id_order')); if (!Validate::isLoadedObject($order)) { - $this->errors[] = Tools::displayError('The order cannot be found within your database.'); + return false; } $this->content .= $this->renderKpis(); - $customer = new Customer($order->id_customer); $carrier = new Carrier($order->id_carrier); $products = $this->getProducts($order); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 811207d39..4f4277bdb 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -468,6 +468,12 @@ class AdminProductsControllerCore extends AdminController $bo_theme = 'default'; } + Media::addJsDef( + array( + 'tb_pathToImage' => '../img/loadingAnimation.gif' + ) + ); + $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js'); $this->addJs(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-process.js'); diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index a8e5507b1..068face35 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -283,11 +283,9 @@ class AdminRequestSqlControllerCore extends AdminController $this->initToolbar(); $this->initPageHeaderToolbar(); if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; + if ($this->loadObject(true)) { + $this->content .= $this->renderForm(); } - - $this->content .= $this->renderForm(); } elseif ($this->display == 'view') { // Some controllers use the view action without an object if ($this->className) { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index f6eb2fb5f..916e6c1c2 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -135,7 +135,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController public function renderView() { - if (!($objOrderReturn = $this->loadObject(true))) { + if (!($objOrderReturn = $this->loadObject())) { return; } $refundStatuses = OrderReturnStateCore::getOrderReturnStates($this->context->language->id);