-
+ {if $ttExemptRooms|count > 0 && $ttExemptProducts|count > 0}
+
+ {/if}
+ {if $ttExemptRooms|count > 0 && $ttExemptProducts|count > 0}
+
+ {/if}
+ {if $ttExemptRooms|count}
+
+ {/if}
+ {if $ttExemptProducts|count}
+
+ {/if}
+ {if $ttExemptRooms|count > 0 && $ttExemptProducts|count > 0}
+
+ {/if}
-
+
+{assign var='ttApplyRooms' value=[]}
+{if isset($use_tourism_tax) && $use_tourism_tax && isset($order_detail_data) && $order_detail_data}
+ {foreach from=$order_detail_data item=ttApplyRoom}
+ {if isset($ttApplyRoom.tourism_tax_status) && $ttApplyRoom.tourism_tax_status != $tourism_tax_status_applied && $ttApplyRoom.tourism_tax_status != $tourism_tax_status_not_applicable && $ttApplyRoom.id_status != $ROOM_STATUS_CANCELLED && !$ttApplyRoom.is_refunded}
+ {append var='ttApplyRooms' value=$ttApplyRoom}
+ {/if}
+ {/foreach}
+{/if}
+{assign var='ttApplyProducts' value=[]}
+{if isset($use_tourism_tax) && $use_tourism_tax}
+ {if isset($hotel_service_products) && $hotel_service_products}
+ {foreach from=$hotel_service_products item=ttApplyProduct}
+ {if isset($ttApplyProduct.tourism_tax_status) && $ttApplyProduct.tourism_tax_status != $tourism_tax_status_applied && $ttApplyProduct.tourism_tax_status != $tourism_tax_status_not_applicable && !$ttApplyProduct.is_refunded && !$ttApplyProduct.is_cancelled}
+ {append var='ttApplyProducts' value=$ttApplyProduct}
+ {/if}
+ {/foreach}
+ {/if}
+ {if isset($standalone_service_products) && $standalone_service_products}
+ {foreach from=$standalone_service_products item=ttApplyProduct}
+ {if isset($ttApplyProduct.tourism_tax_status) && $ttApplyProduct.tourism_tax_status != $tourism_tax_status_applied && $ttApplyProduct.tourism_tax_status != $tourism_tax_status_not_applicable && !$ttApplyProduct.is_refunded && !$ttApplyProduct.is_cancelled}
+ {append var='ttApplyProducts' value=$ttApplyProduct}
+ {/if}
+ {/foreach}
+ {/if}
+{/if}
+
+
+
+
+
+
+ {if $ttApplyRooms|count > 0 && $ttApplyProducts|count > 0}
+
+ {/if}
+ {if $ttApplyRooms|count > 0 && $ttApplyProducts|count > 0}
+
+ {/if}
+ {if $ttApplyRooms|count}
+
+ {/if}
+ {if $ttApplyProducts|count}
+
+ {/if}
+ {if $ttApplyRooms|count > 0 && $ttApplyProducts|count > 0}
+
+ {/if}
+
+
+
+
+
+
diff --git a/classes/module/Module.php b/classes/module/Module.php
index bcd5d8333..c4a5fe6ee 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1663,15 +1663,16 @@ abstract class ModuleCore
if (!in_array($modaddons->name, $modulesOnDisk)) {
if (isset($modaddons->img)) {
- if (!file_exists(_PS_TMP_IMG_DIR_.md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg')) {
- if (!file_put_contents(_PS_TMP_IMG_DIR_.md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg', Tools::file_get_contents($modaddons->img))) {
- copy(_PS_IMG_DIR_.'404.gif', _PS_TMP_IMG_DIR_.md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg');
+ $imgFile = md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg';
+ if (!file_exists(_PS_TMP_IMG_DIR_.$imgFile)) {
+ $imgContent = Tools::file_get_contents($modaddons->img);
+ if ($imgContent) {
+ file_put_contents(_PS_TMP_IMG_DIR_.$imgFile, $imgContent);
}
}
- if (file_exists(_PS_TMP_IMG_DIR_.md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg')) {
- $item->image = '../img/tmp/'.md5((int)$modaddons->id.'-'.$modaddons->name).'.jpg';
- }
+ // Show 404 image without caching it, so the download is retried next time
+ $item->image = file_exists(_PS_TMP_IMG_DIR_.$imgFile) ? '../img/tmp/'.$imgFile : '../img/404.gif';
}
}
diff --git a/classes/order/OrderTaxDetail.php b/classes/order/OrderTaxDetail.php
index a878a1c80..3459d488d 100644
--- a/classes/order/OrderTaxDetail.php
+++ b/classes/order/OrderTaxDetail.php
@@ -1258,21 +1258,25 @@ class OrderTaxDetailCore extends ObjectModel
}
/**
- * Exempt tourism tax for every booking (room + attached services) and every standalone service line
- * of an order; returns only the failing entries.
+ * Exempt tourism tax for the bookings (room + attached services) and standalone service lines
+ * of an order — every one of them by default, or only the given ids; returns only the failing entries.
*
* @param int $idOrder
* @param int $idEmployee
* @param string|null $note Reason for exemption, applied to every booking/line in the order
* @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label — null skips the Order Notes entry entirely, for every booking/line in the order
* @param string $remarkLabel Pre-translated "Remark" label
+ * @param int[]|null $idsHtlBooking Only these bookings are exempted (ids that don't belong to the order are ignored); null = every booking
+ * @param int[]|null $idsServiceLines Only these standalone service lines are exempted (ids that don't belong to the order are ignored); null = every line
* @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
* [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
*/
- public static function exemptForOrder($idOrder, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ public static function exemptForOrder($idOrder, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark', $idsHtlBooking = null, $idsServiceLines = null)
{
$idOrder = (int) $idOrder;
$failures = array();
+ $selectedBookingIds = ($idsHtlBooking !== null) ? array_flip(array_map('intval', $idsHtlBooking)) : null;
+ $selectedServiceLineIds = ($idsServiceLines !== null) ? array_flip(array_map('intval', $idsServiceLines)) : null;
$objBookingDetail = new HotelBookingDetail();
$bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
if ($bookings) {
@@ -1284,6 +1288,9 @@ class OrderTaxDetailCore extends ObjectModel
if (isset($refundedIds[$booking['id']]) || $booking['id_status'] == HotelBookingDetail::STATUS_CANCELLED) {
continue;
}
+ if ($selectedBookingIds !== null && !isset($selectedBookingIds[(int) $booking['id']])) {
+ continue;
+ }
$result = self::exemptBooking($booking['id'], $idEmployee, $note, $autoMsgLabel, $remarkLabel);
if ($result !== self::EXEMPT_OK) {
$failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
@@ -1291,6 +1298,9 @@ class OrderTaxDetailCore extends ObjectModel
}
}
foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ if ($selectedServiceLineIds !== null && !isset($selectedServiceLineIds[$idServiceLine])) {
+ continue;
+ }
$result = self::exemptServiceLine($idServiceLine, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
if ($result !== self::EXEMPT_OK) {
$failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
@@ -1300,21 +1310,25 @@ class OrderTaxDetailCore extends ObjectModel
}
/**
- * Apply tourism tax for every booking and every standalone service line of an order; returns only
- * the failing entries. A booking/line with nothing applicable (neither the room nor any attached
+ * Apply tourism tax for the bookings and standalone service lines of an order — every one of them by
+ * default, or only the given ids; returns only the failing entries. A booking/line with nothing applicable (neither the room nor any attached
* service, or the standalone line itself, has a tourism tax rule) is not a failure — it's silently
* skipped, same as if it had simply been left alone.
*
* @param int $idOrder
* @param int $idEmployee PS employee id (0 = resolved from Context)
* @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely, for every booking/line in the order
+ * @param int[]|null $idsHtlBooking Only these bookings are applied (ids that don't belong to the order are ignored); null = every booking
+ * @param int[]|null $idsServiceLines Only these standalone service lines are applied (ids that don't belong to the order are ignored); null = every line
* @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
* [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
*/
- public static function applyForOrder($idOrder, $idEmployee = 0, $autoMsgLabel = null)
+ public static function applyForOrder($idOrder, $idEmployee = 0, $autoMsgLabel = null, $idsHtlBooking = null, $idsServiceLines = null)
{
$idOrder = (int) $idOrder;
$failures = array();
+ $selectedBookingIds = ($idsHtlBooking !== null) ? array_flip(array_map('intval', $idsHtlBooking)) : null;
+ $selectedServiceLineIds = ($idsServiceLines !== null) ? array_flip(array_map('intval', $idsServiceLines)) : null;
$objBookingDetail = new HotelBookingDetail();
$bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
if ($bookings) {
@@ -1326,6 +1340,9 @@ class OrderTaxDetailCore extends ObjectModel
if (isset($refundedIds[$booking['id']]) || $booking['id_status'] == HotelBookingDetail::STATUS_CANCELLED) {
continue;
}
+ if ($selectedBookingIds !== null && !isset($selectedBookingIds[(int) $booking['id']])) {
+ continue;
+ }
$result = self::applyBooking($booking['id'], $idEmployee, $autoMsgLabel);
if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
$failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
@@ -1333,6 +1350,9 @@ class OrderTaxDetailCore extends ObjectModel
}
}
foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ if ($selectedServiceLineIds !== null && !isset($selectedServiceLineIds[$idServiceLine])) {
+ continue;
+ }
$result = self::applyServiceLine($idServiceLine, $idEmployee, $autoMsgLabel);
if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
$failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
diff --git a/classes/pdf/PDFGenerator.php b/classes/pdf/PDFGenerator.php
index 4cd27a6bb..691ad828b 100644
--- a/classes/pdf/PDFGenerator.php
+++ b/classes/pdf/PDFGenerator.php
@@ -214,7 +214,7 @@ class PDFGeneratorCore extends TCPDF
{
$this->SetHeaderMargin(5);
$this->SetFooterMargin(21);
- $this->setMargins(10, 40, 10);
+ $this->setMargins(10, 45, 10);
$this->AddPage();
$this->writeHTML($this->content, true, false, true, false, '');
}
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index ba55f0602..b9c788ebd 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -3672,7 +3672,9 @@ class AdminOrdersControllerCore extends AdminController
$orderTourismTaxHasUnapplied = false;
if ($useTourismTax && $order_detail_data) {
foreach ($order_detail_data as $bookingRow) {
- if (!empty($bookingRow['is_cancelled']) || !empty($bookingRow['is_refunded'])) {
+ if (!empty($bookingRow['is_cancelled']) || !empty($bookingRow['is_refunded'])
+ || $bookingRow['id_status'] == HotelBookingDetail::STATUS_CANCELLED
+ ) {
continue;
}
if (isset($bookingRow['tourism_tax_status'])) {
@@ -9252,15 +9254,22 @@ class AdminOrdersControllerCore extends AdminController
}
/**
- * Apply tourism tax to a booking (id_htl_booking), a standalone service line
- * (id_service_product_order_detail), or every booking of a whole order (id_order) —
- * see OrderTaxDetail::applyBooking()/applyServiceLine().
+ * Apply tourism tax to the rooms (id_htl_booking[]) and/or standalone service lines
+ * (id_service_product_order_detail[]) selected in the apply modal of an order (id_order) —
+ * see OrderTaxDetail::applyForOrder().
*/
public function ajaxProcessApplyTourismTax()
{
- $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
- $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ if ($this->tabAccess['edit'] !== 1) {
+ die(Tools::jsonEncode(array(
+ 'hasError' => true,
+ 'errors' => array(Tools::displayError('You do not have permission to edit this order.')),
+ )));
+ }
+
$idOrder = (int) Tools::getValue('id_order', 0);
+ $idsHtlBooking = array_filter(array_map('intval', (array) Tools::getValue('id_htl_booking', array())));
+ $idsServiceProductOrderDetail = array_filter(array_map('intval', (array) Tools::getValue('id_service_product_order_detail', array())));
$idEmployee = (int) Context::getContext()->employee->id;
$autoMsgLabel = $this->l('Tourism Tax Applied');
$errors = array();
@@ -9269,20 +9278,15 @@ class AdminOrdersControllerCore extends AdminController
OrderTaxDetail::APPLY_ERROR_NOT_APPLICABLE => $this->l('Tourism tax is not applicable for this booking.'),
);
- if ($idHtlBooking) {
- $result = OrderTaxDetail::applyBooking($idHtlBooking, $idEmployee, $autoMsgLabel);
- if (isset($messagesByResult[$result])) {
- $errors[] = $messagesByResult[$result];
- }
- } elseif ($idServiceProductOrderDetail) {
- $result = OrderTaxDetail::applyServiceLine($idServiceProductOrderDetail, $idEmployee, $autoMsgLabel);
- if (isset($messagesByResult[$result])) {
- $errors[] = $messagesByResult[$result];
- }
- } elseif ($idOrder) {
- $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::applyForOrder($idOrder, $idEmployee, $autoMsgLabel), $messagesByResult);
- } else {
+ if (!Validate::isLoadedObject(new Order($idOrder))) {
$errors[] = $this->l('Invalid request parameters.');
+ } elseif (!$idsHtlBooking && !$idsServiceProductOrderDetail) {
+ $errors[] = Tools::displayError('No booking/products has been selected.');
+ } else {
+ $errors = self::tourismTaxErrorsFromResults(
+ OrderTaxDetail::applyForOrder($idOrder, $idEmployee, $autoMsgLabel, $idsHtlBooking, $idsServiceProductOrderDetail),
+ $messagesByResult
+ );
}
die(Tools::jsonEncode(array(
@@ -9292,15 +9296,22 @@ class AdminOrdersControllerCore extends AdminController
}
/**
- * Exempt tourism tax for a booking (id_htl_booking), a standalone service line
- * (id_service_product_order_detail), or every booking of a whole order (id_order) —
- * see OrderTaxDetail::exemptBooking()/exemptServiceLine().
+ * Exempt tourism tax for the rooms (id_htl_booking[]) and/or standalone service lines
+ * (id_service_product_order_detail[]) selected in the exemption modal of an order (id_order) —
+ * see OrderTaxDetail::exemptForOrder().
*/
public function ajaxProcessExemptTourismTax()
{
- $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
- $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ if ($this->tabAccess['edit'] !== 1) {
+ die(Tools::jsonEncode(array(
+ 'hasError' => true,
+ 'errors' => array(Tools::displayError('You do not have permission to edit this order.')),
+ )));
+ }
+
$idOrder = (int) Tools::getValue('id_order', 0);
+ $idsHtlBooking = array_filter(array_map('intval', (array) Tools::getValue('id_htl_booking', array())));
+ $idsServiceProductOrderDetail = array_filter(array_map('intval', (array) Tools::getValue('id_service_product_order_detail', array())));
$idEmployee = (int) Context::getContext()->employee->id;
$note = trim((string) Tools::getValue('note', ''));
$note = ($note !== '') ? $note : null;
@@ -9312,20 +9323,15 @@ class AdminOrdersControllerCore extends AdminController
OrderTaxDetail::EXEMPT_ERROR_SAVE => $this->l('Could not exempt tourism tax.'),
);
- if ($idHtlBooking) {
- $result = OrderTaxDetail::exemptBooking($idHtlBooking, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
- if (isset($messagesByResult[$result])) {
- $errors[] = $messagesByResult[$result];
- }
- } elseif ($idServiceProductOrderDetail) {
- $result = OrderTaxDetail::exemptServiceLine($idServiceProductOrderDetail, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
- if (isset($messagesByResult[$result])) {
- $errors[] = $messagesByResult[$result];
- }
- } elseif ($idOrder) {
- $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::exemptForOrder($idOrder, $idEmployee, $note, $autoMsgLabel, $remarkLabel), $messagesByResult);
- } else {
+ if (!Validate::isLoadedObject(new Order($idOrder))) {
$errors[] = $this->l('Invalid request parameters.');
+ } elseif (!$idsHtlBooking && !$idsServiceProductOrderDetail) {
+ $errors[] = Tools::displayError('No booking/products has been selected.');
+ } else {
+ $errors = self::tourismTaxErrorsFromResults(
+ OrderTaxDetail::exemptForOrder($idOrder, $idEmployee, $note, $autoMsgLabel, $remarkLabel, $idsHtlBooking, $idsServiceProductOrderDetail),
+ $messagesByResult
+ );
}
die(Tools::jsonEncode(array(
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index aefb0df4d..e5e4bf17b 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -138,7 +138,7 @@ class AdminThemesControllerCore extends AdminController
'icon' => 'icon-html5',
'tabs' => array(
'logo' => $this->l('Logo'),
- 'logo2' => $this->l('Invoice & Email Logos'),
+ 'logo2' => $this->l('Documents & Email Logos'),
'icons' => $this->l('Icons'),
'mobile' => $this->l('Mobile'),
),
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index f6477dab3..10e81cebe 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -101,6 +101,9 @@ class ContactControllerCore extends FrontController
$id_order,
$id_contact,
' AND a.`status` !='. CustomerThread::QLO_CUSTOMER_THREAD_STATUS_CLOSED
+ .' AND a.`user_name` = \''.pSQL($userName).'\''
+ .' AND a.`phone` = \''.pSQL($phone).'\''
+ .' AND a.`subject` = \''.pSQL($subject).'\''
);
}
diff --git a/controllers/front/OurPropertiesController.php b/controllers/front/OurPropertiesController.php
index 3df472859..255714524 100644
--- a/controllers/front/OurPropertiesController.php
+++ b/controllers/front/OurPropertiesController.php
@@ -129,7 +129,6 @@ class OurPropertiesControllerCore extends FrontController
'hotelsInfo' => $hotelsInfo,
'hotelLocationArray' => $hotelLocationArray,
'displayHotelMap' => $displayHotelMap,
- 'WK_HTL_SHORT_DESC' => Configuration::get('WK_HTL_SHORT_DESC', $this->context->language->id),
'currentIndex' => $this->context->link->getPageLink('our-properties')
)
);
diff --git a/install-dev/langs/bg/data/meta.xml b/install-dev/langs/bg/data/meta.xml
index 477b6da88..99b225ecc 100644
--- a/install-dev/langs/bg/data/meta.xml
+++ b/install-dev/langs/bg/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/bn/data/meta.xml b/install-dev/langs/bn/data/meta.xml
index 712181078..430621067 100644
--- a/install-dev/langs/bn/data/meta.xml
+++ b/install-dev/langs/bn/data/meta.xml
@@ -131,10 +131,10 @@
order-slip
-
আমাদের সম্পত্তিসমূহ
+
সম্পত্তিসমূহ
-
our-properties
+
properties
অর্ডার
diff --git a/install-dev/langs/br/data/meta.xml b/install-dev/langs/br/data/meta.xml
index ce3e8cbb4..eba451bf5 100644
--- a/install-dev/langs/br/data/meta.xml
+++ b/install-dev/langs/br/data/meta.xml
@@ -125,10 +125,10 @@
acompanhar-meu-pedido
-
Nossas propriedades
+
Propriedades
-
our-properties
+
propriedades
Nota do pedido
diff --git a/install-dev/langs/cs/data/meta.xml b/install-dev/langs/cs/data/meta.xml
index d15d88d00..d94f13fc9 100644
--- a/install-dev/langs/cs/data/meta.xml
+++ b/install-dev/langs/cs/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Naše nemovitosti
+
Nemovitosti
-
our-properties
+
nemovitosti
Dobropis
diff --git a/install-dev/langs/de/data/meta.xml b/install-dev/langs/de/data/meta.xml
index b490fa981..0353956aa 100644
--- a/install-dev/langs/de/data/meta.xml
+++ b/install-dev/langs/de/data/meta.xml
@@ -125,10 +125,10 @@
bestellungsverfolgung
-
Unsere Immobilien
+
Immobilien
-
our-properties
+
immobilien
Bestellschein
diff --git a/install-dev/langs/en/data/meta.xml b/install-dev/langs/en/data/meta.xml
index 5f4fa253b..aa7fdb97b 100644
--- a/install-dev/langs/en/data/meta.xml
+++ b/install-dev/langs/en/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/es/data/meta.xml b/install-dev/langs/es/data/meta.xml
index 2f7f8eb60..039236338 100644
--- a/install-dev/langs/es/data/meta.xml
+++ b/install-dev/langs/es/data/meta.xml
@@ -125,10 +125,10 @@
seguimiento-pedido
-
Nuestras propiedades
+
Propiedades
-
our-properties
+
propiedades
Albarán
diff --git a/install-dev/langs/fa/data/meta.xml b/install-dev/langs/fa/data/meta.xml
index efe792c08..a14ae5179 100644
--- a/install-dev/langs/fa/data/meta.xml
+++ b/install-dev/langs/fa/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
املاک ما
+
املاک
-
our-properties
+
properties
رسید سفارش
diff --git a/install-dev/langs/fr/data/meta.xml b/install-dev/langs/fr/data/meta.xml
index a3f4b6356..7c59e7882 100644
--- a/install-dev/langs/fr/data/meta.xml
+++ b/install-dev/langs/fr/data/meta.xml
@@ -125,10 +125,10 @@
suivi-commande
-
Nos propriétés
+
Propriétés
-
our-properties
+
proprietes
Avoirs
diff --git a/install-dev/langs/he/data/meta.xml b/install-dev/langs/he/data/meta.xml
index 6e4e74b0c..9e6190c04 100644
--- a/install-dev/langs/he/data/meta.xml
+++ b/install-dev/langs/he/data/meta.xml
@@ -125,10 +125,10 @@
מעקב-הזמנות
-
הנכסים שלנו
+
נכסים
-
our-properties
+
נכסים
שוברי הזמנה
diff --git a/install-dev/langs/hr/data/meta.xml b/install-dev/langs/hr/data/meta.xml
index c1b1b4d50..4e46d6e71 100644
--- a/install-dev/langs/hr/data/meta.xml
+++ b/install-dev/langs/hr/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/hu/data/meta.xml b/install-dev/langs/hu/data/meta.xml
index 2eaba831e..9e2b2cbf7 100644
--- a/install-dev/langs/hu/data/meta.xml
+++ b/install-dev/langs/hu/data/meta.xml
@@ -131,10 +131,10 @@
order-slip
-
Our Properties
+
Properties
-
our-properties
+
properties
Order
diff --git a/install-dev/langs/id/data/meta.xml b/install-dev/langs/id/data/meta.xml
index a2d237d81..c017d7083 100644
--- a/install-dev/langs/id/data/meta.xml
+++ b/install-dev/langs/id/data/meta.xml
@@ -125,10 +125,10 @@
pantau-order
-
Properti kami
+
Properti
-
our-properties
+
properti
Slip order
diff --git a/install-dev/langs/it/data/meta.xml b/install-dev/langs/it/data/meta.xml
index d76e76389..3fbeb8d4e 100644
--- a/install-dev/langs/it/data/meta.xml
+++ b/install-dev/langs/it/data/meta.xml
@@ -131,10 +131,10 @@
buono-ordine
-
Le nostre proprietà
+
Proprietà
-
our-properties
+
proprieta
Ordine
diff --git a/install-dev/langs/lt/data/meta.xml b/install-dev/langs/lt/data/meta.xml
index 9edaf7602..85236eccd 100644
--- a/install-dev/langs/lt/data/meta.xml
+++ b/install-dev/langs/lt/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/mk/data/meta.xml b/install-dev/langs/mk/data/meta.xml
index 56f0d3810..f3264c92b 100644
--- a/install-dev/langs/mk/data/meta.xml
+++ b/install-dev/langs/mk/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Order slip
diff --git a/install-dev/langs/nl/data/meta.xml b/install-dev/langs/nl/data/meta.xml
index d2ad17c19..09924ce47 100644
--- a/install-dev/langs/nl/data/meta.xml
+++ b/install-dev/langs/nl/data/meta.xml
@@ -178,4 +178,10 @@
product-vergelijking
-->
+
+
Eigendommen
+
+
+
eigendommen
+
diff --git a/install-dev/langs/no/data/meta.xml b/install-dev/langs/no/data/meta.xml
index 442acfa9e..37961d739 100644
--- a/install-dev/langs/no/data/meta.xml
+++ b/install-dev/langs/no/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Order slip
diff --git a/install-dev/langs/pl/data/meta.xml b/install-dev/langs/pl/data/meta.xml
index 61c8f1c8c..cf6531280 100644
--- a/install-dev/langs/pl/data/meta.xml
+++ b/install-dev/langs/pl/data/meta.xml
@@ -125,10 +125,10 @@
sledzenie-zamowienia
-
Nasze nieruchomości
+
Nieruchomości
-
our-properties
+
nieruchomosci
Pokwitowania
diff --git a/install-dev/langs/pt/data/meta.xml b/install-dev/langs/pt/data/meta.xml
index f46abbe2d..77805e795 100644
--- a/install-dev/langs/pt/data/meta.xml
+++ b/install-dev/langs/pt/data/meta.xml
@@ -125,10 +125,10 @@
acompanhar-encomenda
-
Nossas propriedades
+
Propriedades
-
our-properties
+
propriedades
Nota de Encomenda
diff --git a/install-dev/langs/qc/data/meta.xml b/install-dev/langs/qc/data/meta.xml
index d83c56aa5..4754977ad 100644
--- a/install-dev/langs/qc/data/meta.xml
+++ b/install-dev/langs/qc/data/meta.xml
@@ -178,4 +178,10 @@
comparaison-produits
-->
+
+
Propriétés
+
+
+
proprietes
+
diff --git a/install-dev/langs/ro/data/meta.xml b/install-dev/langs/ro/data/meta.xml
index 6b93eee1e..2ef3f3fd4 100644
--- a/install-dev/langs/ro/data/meta.xml
+++ b/install-dev/langs/ro/data/meta.xml
@@ -125,10 +125,10 @@
returnari
-
Proprietățile noastre
+
Proprietăți
-
our-properties
+
proprietati
Bon de comandă
diff --git a/install-dev/langs/ru/data/meta.xml b/install-dev/langs/ru/data/meta.xml
index 908c81c4b..f650415ae 100644
--- a/install-dev/langs/ru/data/meta.xml
+++ b/install-dev/langs/ru/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Наши объекты
+
Объекты
-
our-properties
+
properties
Бланк заказа
diff --git a/install-dev/langs/si/data/meta.xml b/install-dev/langs/si/data/meta.xml
index a6b3d6a23..0f90fd954 100644
--- a/install-dev/langs/si/data/meta.xml
+++ b/install-dev/langs/si/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/sr/data/meta.xml b/install-dev/langs/sr/data/meta.xml
index 7aff1d638..627c49699 100644
--- a/install-dev/langs/sr/data/meta.xml
+++ b/install-dev/langs/sr/data/meta.xml
@@ -119,10 +119,10 @@
my-account
-
Our Properties
+
Properties
-
our-properties
+
properties
Order follow
diff --git a/install-dev/langs/sv/data/meta.xml b/install-dev/langs/sv/data/meta.xml
index ef818fd95..8dc2cd39d 100644
--- a/install-dev/langs/sv/data/meta.xml
+++ b/install-dev/langs/sv/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Credit slip
diff --git a/install-dev/langs/tw/data/meta.xml b/install-dev/langs/tw/data/meta.xml
index a73b12ef7..d889dafd9 100644
--- a/install-dev/langs/tw/data/meta.xml
+++ b/install-dev/langs/tw/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
我們的物業
+
物業
-
our-properties
+
properties
訂購單
diff --git a/install-dev/langs/vn/data/meta.xml b/install-dev/langs/vn/data/meta.xml
index 1a84b1dc9..ba45c7365 100644
--- a/install-dev/langs/vn/data/meta.xml
+++ b/install-dev/langs/vn/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Các bất động sản của chúng tôi
+
Bất động sản
-
our-properties
+
properties
Phiếu tín dụng
diff --git a/install-dev/langs/zh/data/meta.xml b/install-dev/langs/zh/data/meta.xml
index 2c6fe190c..f840044f0 100644
--- a/install-dev/langs/zh/data/meta.xml
+++ b/install-dev/langs/zh/data/meta.xml
@@ -125,10 +125,10 @@
order-follow
-
Our Properties
+
Properties
-
our-properties
+
properties
Order slip
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index a4227cd3e..347cab3f9 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -273,7 +273,7 @@
{l s='Total Rooms Cost in cart' mod='blockcart'}
- {if $display_tax_label}
+ {if $use_taxes && $display_tax_label}
{if $priceDisplay == 1}
{l s='(tax excl.)' mod='blockcart'}
{else}
@@ -292,7 +292,7 @@
{l s='Total Product Cost in cart' mod='blockcart'}
- {if $display_tax_label}
+ {if $use_taxes && $display_tax_label}
{if $priceDisplay == 1}
{l s='(tax excl.)' mod='blockcart'}
{else}
@@ -331,7 +331,7 @@
{/if} -->