diff --git a/admin/themes/default/template/controllers/orders/_booking_documents.tpl b/admin/themes/default/template/controllers/orders/_booking_documents.tpl index 676cd44e6..c3121ad42 100644 --- a/admin/themes/default/template/controllers/orders/_booking_documents.tpl +++ b/admin/themes/default/template/controllers/orders/_booking_documents.tpl @@ -43,6 +43,6 @@ {/foreach} {else} - {l s='No documents.'} + {l s='No documents uploaded yet.'} {/if} diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index c0fb43ba0..28b2e61d0 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1703,10 +1703,10 @@ class AdminOrdersControllerCore extends AdminController $this->errors[] = $this->l('Please upload a document.'); } elseif ($objHotelBookingDocument->fileInfo['size'] > Tools::getMaxUploadSize()) { $this->errors[] = $this->l('Uploaded file size is too large.'); - } elseif(!ImageManager::isRealImage($objHotelBookingDocument->fileInfo['tmp_name']) - || $objHotelBookingDocument->fileInfo['mime'] != 'application/pdf' + } elseif(!(ImageManager::isRealImage($objHotelBookingDocument->fileInfo['tmp_name']) + || $objHotelBookingDocument->fileInfo['mime'] == 'application/pdf') ) { - $this->errors[] = $this->l('Please upload an image or a PDF file only.'); + $this->errors[] = $this->l('Please upload an image or a PDF file only. Allowed image formats: .gif, .jpg, .jpeg and .png'); } if (!count($this->errors)) {