+
{if $profile.id_profile != $admin_profile}
-
+
+ {if isset($hotels) && $hotels}
+
@@ -255,8 +331,8 @@
{if !$tab.id_parent OR $tab.id_parent == -1}
{assign var=is_child value=false}
{assign var=result_accesses value=0}
-
diff --git a/mails/en/footer.txt b/mails/en/footer.txt
index 098f27759..86da0312a 100644
--- a/mails/en/footer.txt
+++ b/mails/en/footer.txt
@@ -1,4 +1,4 @@
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html
index 1afd8dd81..016362b39 100644
--- a/mails/en/forward_msg.html
+++ b/mails/en/forward_msg.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/forward_msg.txt b/mails/en/forward_msg.txt
index f01d650f2..82180d4f5 100644
--- a/mails/en/forward_msg.txt
+++ b/mails/en/forward_msg.txt
@@ -1,14 +1,14 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-{employee} wanted to forward this discussion to you.
+{employee} wanted to forward this discussion to you.
DISCUSSION HISTORY: {messages}
-{employee} added "{comment}"
+{employee} added "{comment}"
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html
index 8df5c9efb..ae6cde216 100644
--- a/mails/en/guest_to_customer.html
+++ b/mails/en/guest_to_customer.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt
index fa1e87641..13eeb05ad 100644
--- a/mails/en/guest_to_customer.txt
+++ b/mails/en/guest_to_customer.txt
@@ -1,19 +1,19 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your guest account for {shop_name} was converted to a customer
-account.
+account.
E-MAIL ADDRESS: {email}
-PASSWORD: {passwd}
+PASSWORD: {passwd}
-Please be careful when sharing these login details with others.
+Please be careful when sharing these login details with others.
-You can access your customer account on our shop: {shop_url}
+You can access your customer account on our shop: {shop_url}
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/header.html b/mails/en/header.html
index d690de932..b0ae239a7 100644
--- a/mails/en/header.html
+++ b/mails/en/header.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
-
-
-
-
-
-
- {/if}
{/foreach}
{/foreach}
{/if}
-
+
diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt
index 1ba71f5c9..0820c04d4 100644
--- a/mails/en/in_transit.txt
+++ b/mails/en/in_transit.txt
@@ -1,21 +1,21 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-Your order with the reference {order_name} is currently in transit.
+Your order with the reference {order_name} is currently in transit.
You can track your package using the following link: {followup}
-[/{followup}]
+[/{followup}]
You can review your order and download your invoice from the
"Order history" [/{history_url}] section of your customer account by
-clicking "My account" [/{my_account_url}] on our shop.
+clicking "My account" [/{my_account_url}] on our shop.
If you have a guest account, you can follow your order via the
"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html
index 0e9a13daf..97af96717 100644
--- a/mails/en/log_alert.html
+++ b/mails/en/log_alert.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/log_alert.txt b/mails/en/log_alert.txt
index 9757745bd..a24385361 100644
--- a/mails/en/log_alert.txt
+++ b/mails/en/log_alert.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
WARNING: you have received a new log alert in your Back Office.
You can check for it in the "TOOLS" > "LOGS" section of your Back
-Office.
+Office.
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html
index 2dd20f8e0..ae8bbf4bc 100644
--- a/mails/en/newsletter.html
+++ b/mails/en/newsletter.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/newsletter.txt b/mails/en/newsletter.txt
index b7ae13105..98f641ada 100644
--- a/mails/en/newsletter.txt
+++ b/mails/en/newsletter.txt
@@ -1,10 +1,10 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-{message}
+{message}
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html
index 7fb81b435..a6efa6bd6 100644
--- a/mails/en/order_canceled.html
+++ b/mails/en/order_canceled.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt
index c087d636b..fa06f3499 100644
--- a/mails/en/order_canceled.txt
+++ b/mails/en/order_canceled.txt
@@ -1,19 +1,19 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your order with the reference {order_name} from {shop_name} has
-been canceled.
+been canceled.
You can review your order and download your invoice from the
"Order history" [/{history_url}] section of your customer account by
-clicking "My account" [/{my_account_url}] on our shop.
+clicking "My account" [/{my_account_url}] on our shop.
If you have a guest account, you can follow your order via the
"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html
index c2974d252..49bc30f84 100644
--- a/mails/en/order_changed.html
+++ b/mails/en/order_changed.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt
index 0fe4a6c4c..4530667e2 100644
--- a/mails/en/order_changed.txt
+++ b/mails/en/order_changed.txt
@@ -1,19 +1,19 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your order with the reference {order_name} from {shop_name} has
-been changed by the merchant.
+been changed by the merchant.
You can review your order and download your invoice from the
"Order history" [/{history_url}] section of your customer account by
-clicking "My account" [/{my_account_url}] on our shop.
+clicking "My account" [/{my_account_url}] on our shop.
If you have a guest account, you can follow your order via the
"Guest Tracking" [/{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 0c2561275..afe61acff 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -106,22 +106,28 @@
-
-
+
+
@@ -272,7 +251,7 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_verif.txt b/modules/blocknewsletter/mails/ag/newsletter_verif.txt
index f38c71d0e..66fd3342a 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ag/newsletter_verif.txt
@@ -9,5 +9,5 @@ solicitud haciendo clic en enlace de té abajo:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ag/newsletter_voucher.html b/modules/blocknewsletter/mails/ag/newsletter_voucher.html
index 639c3dd2d..2ecbd685c 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ag/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blocknewsletter/mails/ag/newsletter_voucher.txt b/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
index 3b6959801..6075fbb20 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Después de su suscripción a nuestro boletín, nos complace
ofrecerle el siguiente cupón: {discount}
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_conf.html b/modules/blocknewsletter/mails/ar/newsletter_conf.html
index 9e8fb9c12..ff868f9a0 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_conf.html
@@ -4,51 +4,51 @@
رسالة من {shop_name}
-
-
-
@@ -101,7 +101,7 @@
- {shop_name} مدعوم من بريستاشوب™
+ {shop_name} مدعوم من Webkul™
diff --git a/modules/blocknewsletter/mails/ar/newsletter_conf.txt b/modules/blocknewsletter/mails/ar/newsletter_conf.txt
index 9e63f196d..28c19a44b 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[/{shop_url}]
+[/{shop_url}]
-مرحباً
+مرحباً
-شكراً لإشتراكك في النشرة البريدية.
+شكراً لإشتراكك في النشرة البريدية.
-{shop_name} [/{shop_url}] مدعوم من بريستاشوب(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_verif.html b/modules/blocknewsletter/mails/ar/newsletter_verif.html
index 3ea3ecce1..484b9fc93 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_verif.html
@@ -4,51 +4,51 @@
رسالة من {shop_name}
-
-
-
@@ -101,7 +101,7 @@
- {shop_name} مدعوم من بريستاشوب™
+ {shop_name} مدعوم من Webkul™
diff --git a/modules/blocknewsletter/mails/ar/newsletter_verif.txt b/modules/blocknewsletter/mails/ar/newsletter_verif.txt
index 86bc87e2e..410b5c414 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_verif.txt
@@ -1,15 +1,15 @@
-[/{shop_url}]
+[/{shop_url}]
-مرحباً
+مرحباً
شكرا لك لانضمامك الى خدمة الرسائل
الاخبارية، الرجاء تأكيد طلب الانضمام
الى الخدمة من خلال الضعط على الرابط
التالي:
-{verif_url} [/{verif_url}]
+{verif_url} [/{verif_url}]
-{shop_name} [/{shop_url}] مدعوم من بريستاشوب(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_voucher.html b/modules/blocknewsletter/mails/ar/newsletter_voucher.html
index 1b4353653..c70980924 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_voucher.html
@@ -4,51 +4,51 @@
رسالة من {shop_name}
-
-
-
@@ -102,7 +102,7 @@
- {shop_name} مدعوم من بريستاشوب™
+ {shop_name} مدعوم من Webkul™
diff --git a/modules/blocknewsletter/mails/ar/newsletter_voucher.txt b/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
index 0f23c811c..dcf28a878 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
@@ -1,12 +1,12 @@
-[/{shop_url}]
+[/{shop_url}]
-مرحباً
+مرحباً
لانضمامك الى خدمة الرسائل
الاخبارية، يسعدنا ات تقدم لك القسيمة
-التالية: {discount}
+التالية: {discount}
-{shop_name} [/{shop_url}] مدعوم من بريستاشوب(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_conf.html b/modules/blocknewsletter/mails/bg/newsletter_conf.html
index e5a3cfba0..793781cc2 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} се управлява с Webkul™
+ {shop_name} се управлява с Webkul™
diff --git a/modules/blocknewsletter/mails/bg/newsletter_conf.txt b/modules/blocknewsletter/mails/bg/newsletter_conf.txt
index c764f0dbc..fad1c8a41 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_conf.txt
@@ -7,5 +7,5 @@
НАШИЯТ БЮЛЕТИН.
{shop_name} [{shop_url}] се управлява
-с Webkul(tm) [https://webkul.com/]
+с Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_verif.html b/modules/blocknewsletter/mails/bg/newsletter_verif.html
index 405623925..0145480f1 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} се управлява с Webkul™
+ {shop_name} се управлява с Webkul™
diff --git a/modules/blocknewsletter/mails/bg/newsletter_verif.txt b/modules/blocknewsletter/mails/bg/newsletter_verif.txt
index ef5131dda..9c9f9d602 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_verif.txt
@@ -10,5 +10,5 @@
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] се управлява
-с Webkul(tm) [https://webkul.com/]
+с Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_voucher.html b/modules/blocknewsletter/mails/bg/newsletter_voucher.html
index 327ef35ae..d4391a314 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} се управлява с Webkul™
+ {shop_name} се управлява с Webkul™
diff --git a/modules/blocknewsletter/mails/bg/newsletter_voucher.txt b/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
index c4939cf2c..bd5904c7a 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
@@ -8,5 +8,5 @@
предложим следният ваучер: {discount}
{shop_name} [{shop_url}] се управлява
-с Webkul(tm) [https://webkul.com/]
+с Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/br/newsletter_conf.html b/modules/blocknewsletter/mails/br/newsletter_conf.html
index 4b1145311..65182a377 100644
--- a/modules/blocknewsletter/mails/br/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/br/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} baseado em Webkul™
+ {shop_name} baseado em Webkul™
diff --git a/modules/blocknewsletter/mails/br/newsletter_conf.txt b/modules/blocknewsletter/mails/br/newsletter_conf.txt
index 47369d82d..f09fb5cde 100644
--- a/modules/blocknewsletter/mails/br/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_conf.txt
@@ -6,5 +6,5 @@ Olá,
OBRIGADO POR ASSINAR A NOSSA NEWSLETTER.
{shop_name} [{shop_url}] baseado em
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/br/newsletter_verif.html b/modules/blocknewsletter/mails/br/newsletter_verif.html
index d3b6c8612..699ac1686 100644
--- a/modules/blocknewsletter/mails/br/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/br/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} baseado em Webkul™
+ {shop_name} baseado em Webkul™
diff --git a/modules/blocknewsletter/mails/br/newsletter_verif.txt b/modules/blocknewsletter/mails/br/newsletter_verif.txt
index 1d0d4507e..0cde4f7bf 100644
--- a/modules/blocknewsletter/mails/br/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_verif.txt
@@ -9,5 +9,5 @@ solicitação clicando no link abaixo:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] baseado em
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/br/newsletter_voucher.html b/modules/blocknewsletter/mails/br/newsletter_voucher.html
index 2c620769f..f64be61bb 100644
--- a/modules/blocknewsletter/mails/br/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/br/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} baseado em Webkul™
+ {shop_name} baseado em Webkul™
diff --git a/modules/blocknewsletter/mails/br/newsletter_voucher.txt b/modules/blocknewsletter/mails/br/newsletter_voucher.txt
index 4905f3267..0d09dc29e 100644
--- a/modules/blocknewsletter/mails/br/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Por se cadastrar na nossa newsletter, nós temos o prazer de lhe
oferecer o seguinte cupom de desconto: {discount}
{shop_name} [{shop_url}] baseado em
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_conf.html b/modules/blocknewsletter/mails/ca/newsletter_conf.html
index f80694709..73255ea90 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} desenvolupat amb Webkul™
+ {shop_name} desenvolupat amb Webkul™
diff --git a/modules/blocknewsletter/mails/ca/newsletter_conf.txt b/modules/blocknewsletter/mails/ca/newsletter_conf.txt
index 8ec54e5c4..c38143089 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_conf.txt
@@ -6,5 +6,5 @@ Ei,
GRÀCIES PER SUBSCRIURE-US A LA NOSTRA NEWSLETTER.
{shop_name} [{shop_url}] desenvolupat amb
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_verif.html b/modules/blocknewsletter/mails/ca/newsletter_verif.html
index 19a3eb061..3f59de622 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} desenvolupat amb Webkul™
+ {shop_name} desenvolupat amb Webkul™
diff --git a/modules/blocknewsletter/mails/ca/newsletter_verif.txt b/modules/blocknewsletter/mails/ca/newsletter_verif.txt
index 254474ba6..e791f123e 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_verif.txt
@@ -9,5 +9,5 @@ la petició fent clic sobre l'enllaç de sota:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] desenvolupat amb
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_voucher.html b/modules/blocknewsletter/mails/ca/newsletter_voucher.html
index bd2f7e413..93405054c 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} desenvolupat amb Webkul™
+ {shop_name} desenvolupat amb Webkul™
diff --git a/modules/blocknewsletter/mails/ca/newsletter_voucher.txt b/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
index 64443b924..763585da9 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Quant a la subscripció a la newsletter, ens plau oferir-vos el
següent cupó de descompte: {discount}
{shop_name} [{shop_url}] desenvolupat amb
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/de/newsletter_conf.html b/modules/blocknewsletter/mails/de/newsletter_conf.html
index 90c4bf029..f4a5e86b0 100644
--- a/modules/blocknewsletter/mails/de/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/de/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/de/newsletter_conf.txt b/modules/blocknewsletter/mails/de/newsletter_conf.txt
index cb4a2e9d0..7f7669c47 100644
--- a/modules/blocknewsletter/mails/de/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_conf.txt
@@ -6,5 +6,5 @@ Hallo,
VIELEN DANK FÜR IHRE ANMELDUNG ZU UNSEREM NEWSLETTER.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/de/newsletter_verif.html b/modules/blocknewsletter/mails/de/newsletter_verif.html
index fab17c27a..e92c98552 100644
--- a/modules/blocknewsletter/mails/de/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/de/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/de/newsletter_verif.txt b/modules/blocknewsletter/mails/de/newsletter_verif.txt
index d4e820bd3..363d7167a 100644
--- a/modules/blocknewsletter/mails/de/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_verif.txt
@@ -9,5 +9,5 @@ bestätigen Sie Ihre Anmeldung durch Klick auf den folgenden Link:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/de/newsletter_voucher.html b/modules/blocknewsletter/mails/de/newsletter_voucher.html
index b73bf0095..4f7dd65ed 100644
--- a/modules/blocknewsletter/mails/de/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/de/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/de/newsletter_voucher.txt b/modules/blocknewsletter/mails/de/newsletter_voucher.txt
index d0906aba3..54561c5c1 100644
--- a/modules/blocknewsletter/mails/de/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Sie haben unseren Newsletter abonniert. Als Dankeschön erhalten
Sie den folgenden Gutschein: {discount}
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html
index 81a37d31e..a5de1a2d8 100644
--- a/modules/blocknewsletter/mails/en/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/en/newsletter_conf.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.txt b/modules/blocknewsletter/mails/en/newsletter_conf.txt
index f34d69255..8d457066b 100644
--- a/modules/blocknewsletter/mails/en/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi,
+Hi,
-THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
+THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html
index 85554a712..8b4281ea7 100644
--- a/modules/blocknewsletter/mails/en/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/en/newsletter_verif.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.txt b/modules/blocknewsletter/mails/en/newsletter_verif.txt
index ec21e44a9..688a1a755 100644
--- a/modules/blocknewsletter/mails/en/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi,
+Hi,
Thank you for subscribing to our newsletter, please confirm your
request by clicking the link below :
-{verif_url} [/{verif_url}]
+{verif_url} [/{verif_url}]
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html
index bf8b2f8ef..cb8e3db1e 100644
--- a/modules/blocknewsletter/mails/en/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.txt b/modules/blocknewsletter/mails/en/newsletter_voucher.txt
index d01ee9b62..7e1039388 100644
--- a/modules/blocknewsletter/mails/en/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi,
+Hi,
Regarding your newsletter subscription, we are pleased to offer
-you the following voucher: {discount}
+you the following voucher: {discount}
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/es/newsletter_conf.html b/modules/blocknewsletter/mails/es/newsletter_conf.html
index 71b49ef0c..fbe0760b7 100644
--- a/modules/blocknewsletter/mails/es/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/es/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blocknewsletter/mails/es/newsletter_conf.txt b/modules/blocknewsletter/mails/es/newsletter_conf.txt
index 6530ede34..bf6b9f40a 100644
--- a/modules/blocknewsletter/mails/es/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_conf.txt
@@ -6,5 +6,5 @@ Hola,
GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN.
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.html b/modules/blocknewsletter/mails/es/newsletter_verif.html
index 9786376c7..a952c3ced 100644
--- a/modules/blocknewsletter/mails/es/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/es/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.txt b/modules/blocknewsletter/mails/es/newsletter_verif.txt
index f38c71d0e..66fd3342a 100644
--- a/modules/blocknewsletter/mails/es/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_verif.txt
@@ -9,5 +9,5 @@ solicitud haciendo clic en enlace de té abajo:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/es/newsletter_voucher.html b/modules/blocknewsletter/mails/es/newsletter_voucher.html
index 639c3dd2d..2ecbd685c 100644
--- a/modules/blocknewsletter/mails/es/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/es/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blocknewsletter/mails/es/newsletter_voucher.txt b/modules/blocknewsletter/mails/es/newsletter_voucher.txt
index 3b6959801..6075fbb20 100644
--- a/modules/blocknewsletter/mails/es/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Después de su suscripción a nuestro boletín, nos complace
ofrecerle el siguiente cupón: {discount}
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_conf.html b/modules/blocknewsletter/mails/fr/newsletter_conf.html
index 801138dfc..79d43ea4b 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_conf.html
@@ -4,56 +4,56 @@
Message de {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/fr/newsletter_conf.txt b/modules/blocknewsletter/mails/fr/newsletter_conf.txt
index 7cc1fe26f..b392f55bd 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[/{shop_url}]
+[/{shop_url}]
-Bonjour,
+Bonjour,
-MERCI DE VOUS ÊTRE INSCRIT À NOTRE NEWSLETTER.
+MERCI DE VOUS ÊTRE INSCRIT À NOTRE NEWSLETTER.
-{shop_name} [/{shop_url}] réalisé avec PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] réalisé avec Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_verif.html b/modules/blocknewsletter/mails/fr/newsletter_verif.html
index 5e90bcbd6..800f50df2 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_verif.html
@@ -4,56 +4,56 @@
Message de {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/fr/newsletter_verif.txt b/modules/blocknewsletter/mails/fr/newsletter_verif.txt
index 2de6d2145..a9b1e6f91 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Bonjour,
+Bonjour,
Merci de vous être inscrit à notre newsletter, veuillez confirmer
votre inscription en cliquant sur le lien ci-dessous :
-{verif_url} [/{verif_url}]
+{verif_url} [/{verif_url}]
-{shop_name} [/{shop_url}] réalisé avec PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] réalisé avec Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_voucher.html b/modules/blocknewsletter/mails/fr/newsletter_voucher.html
index 23aa63406..08daeeccf 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_voucher.html
@@ -4,56 +4,56 @@
Message de {shop_name}
-
-
-
-
+
diff --git a/modules/blocknewsletter/mails/fr/newsletter_voucher.txt b/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
index fa3dae492..84f00d096 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[/{shop_url}]
+[/{shop_url}]
-Bonjour,
+Bonjour,
En remerciement pour votre inscription à notre newsletter nous
-avons le plaisir de vous offrir un bon de réduction : {discount}
+avons le plaisir de vous offrir un bon de réduction : {discount}
-{shop_name} [/{shop_url}] réalisé avec PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] réalisé avec Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_conf.html b/modules/blocknewsletter/mails/gl/newsletter_conf.html
index 7f61bd741..a5de1a2d8 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/gl/newsletter_conf.txt b/modules/blocknewsletter/mails/gl/newsletter_conf.txt
index 06aedc7a5..3f8772971 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_conf.txt
@@ -6,5 +6,5 @@ Hi,
THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_verif.html b/modules/blocknewsletter/mails/gl/newsletter_verif.html
index 334242ed4..8b4281ea7 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/gl/newsletter_verif.txt b/modules/blocknewsletter/mails/gl/newsletter_verif.txt
index 0ccad6a66..125f11fe4 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_verif.txt
@@ -9,5 +9,5 @@ request by clicking the link below :
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_voucher.html b/modules/blocknewsletter/mails/gl/newsletter_voucher.html
index 9340e71c7..cb8e3db1e 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blocknewsletter/mails/gl/newsletter_voucher.txt b/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
index e0ffda37b..1d9460bec 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Regarding your newsletter subscription, we are pleased to offer
you the following voucher: {discount}
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/id/newsletter_conf.html b/modules/blocknewsletter/mails/id/newsletter_conf.html
index 87d9d1171..67d88e810 100644
--- a/modules/blocknewsletter/mails/id/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/id/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} didukung oleh Webkul™
+ {shop_name} didukung oleh Webkul™
diff --git a/modules/blocknewsletter/mails/id/newsletter_conf.txt b/modules/blocknewsletter/mails/id/newsletter_conf.txt
index f34b37d00..27d2a7aed 100644
--- a/modules/blocknewsletter/mails/id/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_conf.txt
@@ -6,5 +6,5 @@ Halo,
TERIMA KASIH TELAH BERLANGGANAN NEWSLETTER KAMI.
{shop_name} [{shop_url}] didukung oleh
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/id/newsletter_verif.html b/modules/blocknewsletter/mails/id/newsletter_verif.html
index a01eca993..1dd4d302c 100644
--- a/modules/blocknewsletter/mails/id/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/id/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} didukung oleh Webkul™
+ {shop_name} didukung oleh Webkul™
diff --git a/modules/blocknewsletter/mails/id/newsletter_verif.txt b/modules/blocknewsletter/mails/id/newsletter_verif.txt
index 043de7f3a..b914c5d53 100644
--- a/modules/blocknewsletter/mails/id/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_verif.txt
@@ -9,5 +9,5 @@ dengan klik pada tautan berikut :
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] didukung oleh
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/id/newsletter_voucher.html b/modules/blocknewsletter/mails/id/newsletter_voucher.html
index 4445bd468..6ed00b777 100644
--- a/modules/blocknewsletter/mails/id/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/id/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} didukung oleh Webkul™
+ {shop_name} didukung oleh Webkul™
diff --git a/modules/blocknewsletter/mails/id/newsletter_voucher.txt b/modules/blocknewsletter/mails/id/newsletter_voucher.txt
index ed063e8f0..9259e89e8 100644
--- a/modules/blocknewsletter/mails/id/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Karena telah berlangganan newsletter, kami dengan senang hati
menawarkan voucher berikut: {discount}
{shop_name} [{shop_url}] didukung oleh
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_conf.html b/modules/blocknewsletter/mails/nl/newsletter_conf.html
index 8415c5f61..ffda37f12 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_conf.html
@@ -101,7 +101,7 @@
- {shop_name} gebouwd met Webkul™
+ {shop_name} gebouwd met Webkul™
diff --git a/modules/blocknewsletter/mails/nl/newsletter_conf.txt b/modules/blocknewsletter/mails/nl/newsletter_conf.txt
index bc0247a31..e35261a6e 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_conf.txt
@@ -6,5 +6,5 @@ Hallo,
BEDANKT VOOR UW INSCHRIJVING OP ONZE NIEUWSBRIEF
{shop_name} [{shop_url}] gebouwd met
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_verif.html b/modules/blocknewsletter/mails/nl/newsletter_verif.html
index cffdf6e46..a3ba18da4 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_verif.html
@@ -101,7 +101,7 @@
- {shop_name} gebouwd met Webkul™
+ {shop_name} gebouwd met Webkul™
diff --git a/modules/blocknewsletter/mails/nl/newsletter_verif.txt b/modules/blocknewsletter/mails/nl/newsletter_verif.txt
index f3caf4f4e..51ab789e5 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_verif.txt
@@ -9,5 +9,5 @@ aanvraag door te klikken op de volgende link:
{verif_url} [{verif_url}]
{shop_name} [{shop_url}] gebouwd met
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_voucher.html b/modules/blocknewsletter/mails/nl/newsletter_voucher.html
index f2d88e1b0..3b35d7189 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_voucher.html
@@ -102,7 +102,7 @@
- {shop_name} gebouwd met Webkul™
+ {shop_name} gebouwd met Webkul™
diff --git a/modules/blocknewsletter/mails/nl/newsletter_voucher.txt b/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
index d56179cc7..591edcae4 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
@@ -7,5 +7,5 @@ Naar aanleiding van uw nieuwsbrief inschrijving bieden wij u graag
de volgende waardebon aan: {discount}
{shop_name} [{shop_url}] gebouwd met
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/ag/wishlink.html b/modules/blockwishlist/mails/ag/wishlink.html
index bceeb62cc..07ed59784 100644
--- a/modules/blockwishlist/mails/ag/wishlink.html
+++ b/modules/blockwishlist/mails/ag/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blockwishlist/mails/ag/wishlink.txt b/modules/blockwishlist/mails/ag/wishlink.txt
index e62706ebe..5f34fee79 100644
--- a/modules/blockwishlist/mails/ag/wishlink.txt
+++ b/modules/blockwishlist/mails/ag/wishlink.txt
@@ -9,5 +9,5 @@ que puedan ver su lista de deseos: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/ag/wishlist.html b/modules/blockwishlist/mails/ag/wishlist.html
index 895955f78..f694dd97b 100644
--- a/modules/blockwishlist/mails/ag/wishlist.html
+++ b/modules/blockwishlist/mails/ag/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blockwishlist/mails/ag/wishlist.txt b/modules/blockwishlist/mails/ag/wishlist.txt
index 879a7e5e8..173672039 100644
--- a/modules/blockwishlist/mails/ag/wishlist.txt
+++ b/modules/blockwishlist/mails/ag/wishlist.txt
@@ -9,5 +9,5 @@ deseos: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/ar/wishlink.html b/modules/blockwishlist/mails/ar/wishlink.html
index 9467bbd2e..317b0252e 100644
--- a/modules/blockwishlist/mails/ar/wishlink.html
+++ b/modules/blockwishlist/mails/ar/wishlink.html
@@ -4,51 +4,51 @@
رسالة من {shop_name}
-
-
-
@@ -103,7 +103,7 @@
- {shop_name} مدعوم من بريستاشوب™
+ {shop_name} مدعوم من Webkul™
diff --git a/modules/blockwishlist/mails/ar/wishlink.txt b/modules/blockwishlist/mails/ar/wishlink.txt
index 8f95a97b8..6f392c7a0 100644
--- a/modules/blockwishlist/mails/ar/wishlink.txt
+++ b/modules/blockwishlist/mails/ar/wishlink.txt
@@ -1,14 +1,14 @@
-[/{shop_url}]
+[/{shop_url}]
-مرحباً
+مرحباً
{shop_name} يدعوك لإرسال هذا الرابط الى
اصدقائك، لكي يشاهدوا قائمة امنياتك:
{wishlist}
-{message} [/{message}]
+{message} [/{message}]
-{shop_name} [/{shop_url}] مدعوم من بريستاشوب(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/ar/wishlist.html b/modules/blockwishlist/mails/ar/wishlist.html
index 4ed17e07f..28833ed95 100644
--- a/modules/blockwishlist/mails/ar/wishlist.html
+++ b/modules/blockwishlist/mails/ar/wishlist.html
@@ -4,51 +4,51 @@
رسالة من {shop_name}
-
-
-
@@ -103,7 +103,7 @@
- {shop_name} مدعوم من بريستاشوب™
+ {shop_name} مدعوم من Webkul™
diff --git a/modules/blockwishlist/mails/ar/wishlist.txt b/modules/blockwishlist/mails/ar/wishlist.txt
index 5cb0c5276..73b24f738 100644
--- a/modules/blockwishlist/mails/ar/wishlist.txt
+++ b/modules/blockwishlist/mails/ar/wishlist.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-مرحباً
+مرحباً
{firstname} {lastname} يشير الى انه قد تريد
مشاهدة قائمة امنياته: {wishlist}
-{wishlist} [/{message}]
+{wishlist} [/{message}]
-{shop_name} [/{shop_url}] مدعوم من بريستاشوب(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/bg/wishlink.html b/modules/blockwishlist/mails/bg/wishlink.html
index 7cb6cb08b..7253ec7b6 100644
--- a/modules/blockwishlist/mails/bg/wishlink.html
+++ b/modules/blockwishlist/mails/bg/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} се управлява с Webkul™
+ {shop_name} се управлява с Webkul™
diff --git a/modules/blockwishlist/mails/bg/wishlink.txt b/modules/blockwishlist/mails/bg/wishlink.txt
index 2adc26970..25cc119ea 100644
--- a/modules/blockwishlist/mails/bg/wishlink.txt
+++ b/modules/blockwishlist/mails/bg/wishlink.txt
@@ -10,5 +10,5 @@
{message} [{message}]
{shop_name} [{shop_url}] се управлява
-с Webkul(tm) [https://webkul.com/]
+с Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/bg/wishlist.html b/modules/blockwishlist/mails/bg/wishlist.html
index af5f595f2..c5f1a90b0 100644
--- a/modules/blockwishlist/mails/bg/wishlist.html
+++ b/modules/blockwishlist/mails/bg/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} се управлява с Webkul™
+ {shop_name} се управлява с Webkul™
diff --git a/modules/blockwishlist/mails/bg/wishlist.txt b/modules/blockwishlist/mails/bg/wishlist.txt
index 6cc18d7ce..a9d133105 100644
--- a/modules/blockwishlist/mails/bg/wishlist.txt
+++ b/modules/blockwishlist/mails/bg/wishlist.txt
@@ -10,5 +10,5 @@
{wishlist} [{message}]
{shop_name} [{shop_url}] се управлява
-с Webkul(tm) [https://webkul.com/]
+с Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/br/wishlink.html b/modules/blockwishlist/mails/br/wishlink.html
index 9e692dc7c..ae1ac0836 100644
--- a/modules/blockwishlist/mails/br/wishlink.html
+++ b/modules/blockwishlist/mails/br/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} baseado em Webkul™
+ {shop_name} baseado em Webkul™
diff --git a/modules/blockwishlist/mails/br/wishlink.txt b/modules/blockwishlist/mails/br/wishlink.txt
index a2bbf918a..0c749ef03 100644
--- a/modules/blockwishlist/mails/br/wishlink.txt
+++ b/modules/blockwishlist/mails/br/wishlink.txt
@@ -9,5 +9,5 @@ que eles possam ver a sua lista de presentes: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] baseado em
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/br/wishlist.html b/modules/blockwishlist/mails/br/wishlist.html
index 8ca32a2a7..f79a29279 100644
--- a/modules/blockwishlist/mails/br/wishlist.html
+++ b/modules/blockwishlist/mails/br/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} baseado em Webkul™
+ {shop_name} baseado em Webkul™
diff --git a/modules/blockwishlist/mails/br/wishlist.txt b/modules/blockwishlist/mails/br/wishlist.txt
index e09ffa02c..f7c52c73c 100644
--- a/modules/blockwishlist/mails/br/wishlist.txt
+++ b/modules/blockwishlist/mails/br/wishlist.txt
@@ -9,5 +9,5 @@ lista de presentes: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] baseado em
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/ca/wishlink.html b/modules/blockwishlist/mails/ca/wishlink.html
index 0bc0167e3..43bde32d8 100644
--- a/modules/blockwishlist/mails/ca/wishlink.html
+++ b/modules/blockwishlist/mails/ca/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} desenvolupat amb Webkul™
+ {shop_name} desenvolupat amb Webkul™
diff --git a/modules/blockwishlist/mails/ca/wishlink.txt b/modules/blockwishlist/mails/ca/wishlink.txt
index e10d68d18..32e084a23 100644
--- a/modules/blockwishlist/mails/ca/wishlink.txt
+++ b/modules/blockwishlist/mails/ca/wishlink.txt
@@ -9,5 +9,5 @@ tal que vegin la vostra llista de desitjos: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] desenvolupat amb
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/ca/wishlist.html b/modules/blockwishlist/mails/ca/wishlist.html
index b956bd702..1054a7c88 100644
--- a/modules/blockwishlist/mails/ca/wishlist.html
+++ b/modules/blockwishlist/mails/ca/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} desenvolupat amb Webkul™
+ {shop_name} desenvolupat amb Webkul™
diff --git a/modules/blockwishlist/mails/ca/wishlist.txt b/modules/blockwishlist/mails/ca/wishlist.txt
index e90152c74..36558a297 100644
--- a/modules/blockwishlist/mails/ca/wishlist.txt
+++ b/modules/blockwishlist/mails/ca/wishlist.txt
@@ -9,5 +9,5 @@ llista de desitjos: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] desenvolupat amb
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/de/wishlink.html b/modules/blockwishlist/mails/de/wishlink.html
index 8f455c055..ba3d688e9 100644
--- a/modules/blockwishlist/mails/de/wishlink.html
+++ b/modules/blockwishlist/mails/de/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blockwishlist/mails/de/wishlink.txt b/modules/blockwishlist/mails/de/wishlink.txt
index 34ef3603f..366827d9b 100644
--- a/modules/blockwishlist/mails/de/wishlink.txt
+++ b/modules/blockwishlist/mails/de/wishlink.txt
@@ -9,5 +9,5 @@ damit diese Ihre Wunschliste {wishlist} sehen können: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/de/wishlist.html b/modules/blockwishlist/mails/de/wishlist.html
index d6cf3b097..68dbb0762 100644
--- a/modules/blockwishlist/mails/de/wishlist.html
+++ b/modules/blockwishlist/mails/de/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blockwishlist/mails/de/wishlist.txt b/modules/blockwishlist/mails/de/wishlist.txt
index 91f73ce18..a67d3ac3a 100644
--- a/modules/blockwishlist/mails/de/wishlist.txt
+++ b/modules/blockwishlist/mails/de/wishlist.txt
@@ -9,5 +9,5 @@ Hallo,
{wishlist} [{message}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/en/wishlink.html b/modules/blockwishlist/mails/en/wishlink.html
index 9f14c9ea8..61d89b701 100644
--- a/modules/blockwishlist/mails/en/wishlink.html
+++ b/modules/blockwishlist/mails/en/wishlink.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/modules/blockwishlist/mails/en/wishlink.txt b/modules/blockwishlist/mails/en/wishlink.txt
index 9e3e9d2ff..24a05d66f 100644
--- a/modules/blockwishlist/mails/en/wishlink.txt
+++ b/modules/blockwishlist/mails/en/wishlink.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi,
+Hi,
{shop_name} invites you to send this link to your friends, so they
can see your wishlist: {wishlist}
-{message} [/{message}]
+{message} [/{message}]
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/en/wishlist.html b/modules/blockwishlist/mails/en/wishlist.html
index 740d5ad20..cef52bf7f 100644
--- a/modules/blockwishlist/mails/en/wishlist.html
+++ b/modules/blockwishlist/mails/en/wishlist.html
@@ -4,56 +4,56 @@
Message from {shop_name}
-
-
-
-
+
diff --git a/modules/blockwishlist/mails/en/wishlist.txt b/modules/blockwishlist/mails/en/wishlist.txt
index e63174ecb..670fa05f1 100644
--- a/modules/blockwishlist/mails/en/wishlist.txt
+++ b/modules/blockwishlist/mails/en/wishlist.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi,
+Hi,
{firstname} {lastname} indicated you may want to see his/her
wishlist: {wishlist}
-{wishlist} [/{message}]
+{wishlist} [/{message}]
-{shop_name} [/{shop_url}] powered by PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] powered by Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/es/wishlink.html b/modules/blockwishlist/mails/es/wishlink.html
index bceeb62cc..07ed59784 100644
--- a/modules/blockwishlist/mails/es/wishlink.html
+++ b/modules/blockwishlist/mails/es/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blockwishlist/mails/es/wishlink.txt b/modules/blockwishlist/mails/es/wishlink.txt
index e62706ebe..5f34fee79 100644
--- a/modules/blockwishlist/mails/es/wishlink.txt
+++ b/modules/blockwishlist/mails/es/wishlink.txt
@@ -9,5 +9,5 @@ que puedan ver su lista de deseos: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/es/wishlist.html b/modules/blockwishlist/mails/es/wishlist.html
index 895955f78..f694dd97b 100644
--- a/modules/blockwishlist/mails/es/wishlist.html
+++ b/modules/blockwishlist/mails/es/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} creado por Webkul™
+ {shop_name} creado por Webkul™
diff --git a/modules/blockwishlist/mails/es/wishlist.txt b/modules/blockwishlist/mails/es/wishlist.txt
index 879a7e5e8..173672039 100644
--- a/modules/blockwishlist/mails/es/wishlist.txt
+++ b/modules/blockwishlist/mails/es/wishlist.txt
@@ -9,5 +9,5 @@ deseos: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] creado por
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/fr/wishlink.html b/modules/blockwishlist/mails/fr/wishlink.html
index 56109d935..098b29fe1 100644
--- a/modules/blockwishlist/mails/fr/wishlink.html
+++ b/modules/blockwishlist/mails/fr/wishlink.html
@@ -4,56 +4,56 @@
Message de {shop_name}
-
-
-
-
+
diff --git a/modules/blockwishlist/mails/fr/wishlink.txt b/modules/blockwishlist/mails/fr/wishlink.txt
index 13500cab3..64d6766f5 100644
--- a/modules/blockwishlist/mails/fr/wishlink.txt
+++ b/modules/blockwishlist/mails/fr/wishlink.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Bonjour,
+Bonjour,
{shop_name} vous invite à envoyer ce lien à vos amis qui pourront
alors consulter votre liste de cadeaux {wishlist} : {wishlist}
-{message} [/{message}]
+{message} [/{message}]
-{shop_name} [/{shop_url}] réalisé avec PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] réalisé avec Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/fr/wishlist.html b/modules/blockwishlist/mails/fr/wishlist.html
index a92f59426..2c145946c 100644
--- a/modules/blockwishlist/mails/fr/wishlist.html
+++ b/modules/blockwishlist/mails/fr/wishlist.html
@@ -4,56 +4,56 @@
Message de {shop_name}
-
-
-
-
+
diff --git a/modules/blockwishlist/mails/fr/wishlist.txt b/modules/blockwishlist/mails/fr/wishlist.txt
index 018b8c310..74d213b85 100644
--- a/modules/blockwishlist/mails/fr/wishlist.txt
+++ b/modules/blockwishlist/mails/fr/wishlist.txt
@@ -1,13 +1,13 @@
-[/{shop_url}]
+[/{shop_url}]
-Bonjour,
+Bonjour,
{firstname} {lastname} vous invite à visiter sa liste de cadeaux
{wishlist} : {wishlist}
-{wishlist} [/{message}]
+{wishlist} [/{message}]
-{shop_name} [/{shop_url}] réalisé avec PrestaShop(tm)
-[http://www.prestashop.com/]
+{shop_name} [/{shop_url}] réalisé avec Webkul(tm)
+[https://webkul.com]
diff --git a/modules/blockwishlist/mails/gl/wishlink.html b/modules/blockwishlist/mails/gl/wishlink.html
index 8d565512b..61d89b701 100644
--- a/modules/blockwishlist/mails/gl/wishlink.html
+++ b/modules/blockwishlist/mails/gl/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blockwishlist/mails/gl/wishlink.txt b/modules/blockwishlist/mails/gl/wishlink.txt
index f0291b7e0..bda991622 100644
--- a/modules/blockwishlist/mails/gl/wishlink.txt
+++ b/modules/blockwishlist/mails/gl/wishlink.txt
@@ -9,5 +9,5 @@ can see your wishlist: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/gl/wishlist.html b/modules/blockwishlist/mails/gl/wishlist.html
index 0f6ae2651..cef52bf7f 100644
--- a/modules/blockwishlist/mails/gl/wishlist.html
+++ b/modules/blockwishlist/mails/gl/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/blockwishlist/mails/gl/wishlist.txt b/modules/blockwishlist/mails/gl/wishlist.txt
index 2a0397e4c..f9df44d8e 100644
--- a/modules/blockwishlist/mails/gl/wishlist.txt
+++ b/modules/blockwishlist/mails/gl/wishlist.txt
@@ -9,5 +9,5 @@ wishlist: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/id/wishlink.html b/modules/blockwishlist/mails/id/wishlink.html
index 9b3228335..998eb8305 100644
--- a/modules/blockwishlist/mails/id/wishlink.html
+++ b/modules/blockwishlist/mails/id/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} didukung oleh Webkul™
+ {shop_name} didukung oleh Webkul™
diff --git a/modules/blockwishlist/mails/id/wishlink.txt b/modules/blockwishlist/mails/id/wishlink.txt
index bb750646a..ec8901847 100644
--- a/modules/blockwishlist/mails/id/wishlink.txt
+++ b/modules/blockwishlist/mails/id/wishlink.txt
@@ -9,5 +9,5 @@ Anda agar mereke dapat melihat daftar wishlist Anda: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] didukung oleh
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/id/wishlist.html b/modules/blockwishlist/mails/id/wishlist.html
index 29b2a3d03..7e2bd4609 100644
--- a/modules/blockwishlist/mails/id/wishlist.html
+++ b/modules/blockwishlist/mails/id/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} didukung oleh Webkul™
+ {shop_name} didukung oleh Webkul™
diff --git a/modules/blockwishlist/mails/id/wishlist.txt b/modules/blockwishlist/mails/id/wishlist.txt
index 23ce4d629..24fc7f8bf 100644
--- a/modules/blockwishlist/mails/id/wishlist.txt
+++ b/modules/blockwishlist/mails/id/wishlist.txt
@@ -9,5 +9,5 @@ Halo,
{wishlist} [{message}]
{shop_name} [{shop_url}] didukung oleh
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/nl/wishlink.html b/modules/blockwishlist/mails/nl/wishlink.html
index f6f11b5a2..3fdd68e87 100644
--- a/modules/blockwishlist/mails/nl/wishlink.html
+++ b/modules/blockwishlist/mails/nl/wishlink.html
@@ -103,7 +103,7 @@
- {shop_name} gebouwd met Webkul™
+ {shop_name} gebouwd met Webkul™
diff --git a/modules/blockwishlist/mails/nl/wishlink.txt b/modules/blockwishlist/mails/nl/wishlink.txt
index a62e7bad2..57bdbab55 100644
--- a/modules/blockwishlist/mails/nl/wishlink.txt
+++ b/modules/blockwishlist/mails/nl/wishlink.txt
@@ -9,5 +9,5 @@ zodat ze uw wenslijst kunnen bekijken: {wishlist}
{message} [{message}]
{shop_name} [{shop_url}] gebouwd met
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/blockwishlist/mails/nl/wishlist.html b/modules/blockwishlist/mails/nl/wishlist.html
index 0ba432306..6904bb64e 100644
--- a/modules/blockwishlist/mails/nl/wishlist.html
+++ b/modules/blockwishlist/mails/nl/wishlist.html
@@ -103,7 +103,7 @@
- {shop_name} gebouwd met Webkul™
+ {shop_name} gebouwd met Webkul™
diff --git a/modules/blockwishlist/mails/nl/wishlist.txt b/modules/blockwishlist/mails/nl/wishlist.txt
index 90a7110b2..9e23beeb2 100644
--- a/modules/blockwishlist/mails/nl/wishlist.txt
+++ b/modules/blockwishlist/mails/nl/wishlist.txt
@@ -9,5 +9,5 @@ zijn in zijn/haar wenslijst: {wishlist}
{wishlist} [{message}]
{shop_name} [{shop_url}] gebouwd met
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/cheque/CHANGELOG.txt b/modules/cheque/CHANGELOG.txt
index 70a6eb7ef..a135876cd 100644
--- a/modules/cheque/CHANGELOG.txt
+++ b/modules/cheque/CHANGELOG.txt
@@ -1,3 +1,12 @@
+------------------------------
+# V2.6.2 to V2.6.3
+------------------------------
+
+## Improved/Changed Features:
+
+* [CO] : Correct cart total is sent to validateOrder() in case of advance payment.
+
+
------------------------------
# V2.6.1 to V2.6.2
------------------------------
diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index bbff29457..b86658492 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -40,7 +40,7 @@ public function __construct()
{
$this->name = 'cheque';
$this->tab = 'payments_gateways';
- $this->version = '2.6.2';
+ $this->version = '2.6.3';
$this->author = 'PrestaShop';
$this->controllers = array('payment', 'validation');
$this->is_eu_compatible = 1;
diff --git a/modules/cheque/controllers/front/validation.php b/modules/cheque/controllers/front/validation.php
index 5e31d2768..feea1b913 100644
--- a/modules/cheque/controllers/front/validation.php
+++ b/modules/cheque/controllers/front/validation.php
@@ -64,7 +64,13 @@ public function postProcess()
Tools::redirect('index.php?controller=order&step=1');
$currency = $this->context->currency;
- $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
+
+ if (Configuration::get('WK_ALLOW_ADVANCED_PAYMENT')) {
+ $obj_customer_adv = new HotelCustomerAdvancedPayment();
+ $total = $obj_customer_adv->getOrdertTotal($cart->id, $cart->id_guest);
+ } else {
+ $total = (float)$cart->getOrderTotal(true, Cart::BOTH);
+ }
$mailVars = array(
'{cheque_name}' => Configuration::get('CHEQUE_NAME'),
diff --git a/modules/hotelreservationsystem/CHANGELOG.txt b/modules/hotelreservationsystem/CHANGELOG.txt
index 13cb1ef01..fbe4f9819 100644
--- a/modules/hotelreservationsystem/CHANGELOG.txt
+++ b/modules/hotelreservationsystem/CHANGELOG.txt
@@ -1,3 +1,40 @@
+-------------------------
+# V1.3.0 to V1.4.0
+-------------------------
+
+## Added Features:
+
+[+] CO : Table `htl_booking_demands_tax` added to the module for additional facility tax.
+[+] CO : Table `htl_access` added to the module to manage hotel wise permission management.
+[+] BO : Additional facility : Tax can be applied on additional facilities.
+[+] BO : Additional facility : Per day price calculation option is added.[Price will be calculated on per day basis of the booking or for entire date range of the booking]
+[+] BO : All controllers accesses are now manages according to the hotel wise permission management.
+
+[+] CO : hookActionObjectProfileAddAfter, hookActionObjectProfileDeleteBefore are added to add and delete hotel accessed while adding or deleting any profile.
+
+
+## Improved/changed features:
+
+[+] CO : Table `htl_booking_demands` altered to the manage to additional facility tax.
+[*] CO : getCartFormatedBookinInfoByIdCart(), getCartExtraDemands() functions improved for extra demands in HotelCartBookingData class.
+[*] CO : add(), initAccess(), addHotelsAccessToProfile(), deleteProfileHotelsAccess(), getProfileAccessedHotels(), filterDataByHotelAccess() added in class HotelBranchInformation for managing hotel wise permission management.
+[*] CO : delete() updated in class HotelBranchInformation to delete from htl_access for managing hotel wise permission management while deleting a hotel.
+[*] CO : updateBookingOrderStatusByOrderId() updated in class HotelBookingDetail.
+
+[*] BO : Only imported countries will be shown in the country dropdown while saving a hotel.
+
+## Bug/Issues Resolved:
+
+[-] CO : Resolved: Room type's Advance payment information is now saved while adding room types on the installation of the module. [As room type is unavailable for the advance payment]
+getProductFeaturePricePlanByDateByPriority
+[-] BO : Resolved: Hotel image file does not delete from the folder after hotel image deletion.
+
+
+## Update Policy
+
+- Database changed, Module need upload new file then UNINSTALL and re-installation.
+
+
-------------------------
# V1.2.2 to V1.3.0
-------------------------
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
index 684a7dc0c..69a3fe038 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php
@@ -22,19 +22,34 @@ class HotelBookingDemands extends ObjectModel
{
public $id_htl_booking;
public $name;
- public $price;
+ public $unit_price_tax_excl;
+ public $unit_price_tax_incl;
+ public $total_price_tax_excl;
+ public $total_price_tax_incl;
+ public $id_tax_rules_group;
+ public $tax_computation_method;
+ public $price_calc_method;
public $date_add;
public $date_upd;
+ /** @var TaxCalculator object */
+ public $tax_calculator = null;
+
public static $definition = array(
'table' => 'htl_booking_demands',
- 'primary' => 'id_booking_demands',
+ 'primary' => 'id_booking_demand',
'fields' => array(
'id_htl_booking' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
- 'price' => array('type' => self::TYPE_FLOAT),
+ 'unit_price_tax_excl' => array('type' => self::TYPE_FLOAT),
+ 'unit_price_tax_incl' => array('type' => self::TYPE_FLOAT),
+ 'total_price_tax_excl' => array('type' => self::TYPE_FLOAT),
+ 'total_price_tax_incl' => array('type' => self::TYPE_FLOAT),
'name' => array(
'type' => self::TYPE_STRING, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128
),
+ 'price_calc_method' => array('type' => self::TYPE_INT),
+ 'id_tax_rules_group' => array('type' => self::TYPE_INT),
+ 'tax_computation_method' => array('type' => self::TYPE_INT),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate')
));
@@ -46,8 +61,10 @@ public function getRoomTypeBookingExtraDemands(
$dateFrom = 0,
$dateTo = 0,
$groupByRoom = 1,
- $getTotalPrice = 0
+ $getTotalPrice = 0,
+ $useTax = 1
) {
+ $moduleObj = Module::getInstanceByName('hotelreservationsystem');
$context = Context::getContext();
if (isset($context->currency->id)
&& Validate::isLoadedObject($context->currency)
@@ -80,28 +97,177 @@ public function getRoomTypeBookingExtraDemands(
if ($roomTypeDemands = Db::getInstance()->executeS($sql)) {
if ($getTotalPrice) {
foreach ($roomTypeDemands as $demand) {
- $totalDemandsPrice += $demand['price'];
+ if ($useTax) {
+ $totalDemandsPrice += $demand['total_price_tax_incl'];
+ } else {
+ $totalDemandsPrice += $demand['total_price_tax_excl'];
+ }
}
} else {
if ($groupByRoom) {
$roomDemands = array();
foreach ($roomTypeDemands as $demand) {
+ // Set tax_code
+ if ($taxes = static::getTaxListStatic($demand['id_booking_demand'])) {
+ $taxTemp = array();
+ foreach ($taxes as $tax) {
+ $obj = new Tax($tax['id_tax']);
+ $taxTemp[] = sprintf($moduleObj->l('%1$s%2$s%%'), ($obj->rate + 0), '');
+ }
+ $demand['extra_demands_tax_label'] = implode(', ', $taxTemp);
+
+ } else {
+ $demand['extra_demands_tax_label'] = $moduleObj->l('No tax', 'HotelBookingDemands');
+ }
$roomDemands[$demand['id_room']]['id_room'] = $demand['id_room'];
$roomDemands[$demand['id_room']]['extra_demands'][] = $demand;
}
+ unset($taxTemp);
return $roomDemands;
}
}
}
if ($getTotalPrice) {
- // in PS16 prices are not converted after order
- // $totalDemandsPrice = Tools::convertPrice(
- // $totalDemandsPrice,
- // $idCurrency
- // );
return $totalDemandsPrice;
} else {
return $roomTypeDemands;
}
}
+
+ public static function getTaxListStatic($idBookingDemand)
+ {
+ return Db::getInstance()->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_demands_tax` WHERE `id_booking_demand` = '.(int)$idBookingDemand
+ );
+ }
+
+ public static function getTaxCalculatorStatic($idBookingDemand)
+ {
+ $sql = 'SELECT t.*, d.`tax_computation_method`
+ FROM `'._DB_PREFIX_.'htl_booking_demands_tax` t
+ LEFT JOIN `'._DB_PREFIX_.'htl_booking_demands` d ON (d.`id_booking_demand` = t.`id_booking_demand`)
+ WHERE d.`id_booking_demand` = '.(int)$idBookingDemand;
+
+ $computationMethod = 1;
+ $taxes = array();
+ if ($results = Db::getInstance()->executeS($sql)) {
+ foreach ($results as $result) {
+ $taxes[] = new Tax((int)$result['id_tax']);
+ }
+
+ $computationMethod = $result['tax_computation_method'];
+ }
+
+ return new TaxCalculator($taxes, $computationMethod);
+ }
+
+ public function setBookingDemandTaxDetails()
+ {
+ $idBookingDemand = $this->id;
+ if ($idBookingDemand && Validate::isLoadedObject($objBkDemand = new HotelBookingDemands($idBookingDemand))) {
+ if ($taxCalculator = $this->tax_calculator) {
+ if (!($taxCalculator instanceof TaxCalculator)) {
+ return false;
+ }
+ if (count($taxCalculator->taxes) == 0) {
+ return true;
+ }
+ $values = '';
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand($this->id_global_demand);
+ $priceTaxExcl = $objBkDemand->unit_price_tax_excl;
+ foreach ($taxCalculator->getTaxesAmount($priceTaxExcl) as $idTax => $amount) {
+ $quantity = 1;
+ if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
+ $objBkDetail = new HotelBookingDetail($objBkDemand->id_htl_booking);
+ $quantity = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
+ }
+ switch (Configuration::get('PS_ROUND_TYPE')) {
+ case Order::ROUND_ITEM:
+ $unitAmount = (float)Tools::ps_round($amount, _PS_PRICE_COMPUTE_PRECISION_);
+ $totalAmount = $unitAmount * $quantity;
+ break;
+ case Order::ROUND_LINE:
+ $unitAmount = $amount;
+ $totalAmount = Tools::ps_round(
+ $unitAmount * $quantity,
+ _PS_PRICE_COMPUTE_PRECISION_
+ );
+ break;
+ case Order::ROUND_TOTAL:
+ $unitAmount = $amount;
+ $totalAmount = $unitAmount * $quantity;
+ break;
+ }
+ $values .= '('.(int)$idBookingDemand.','.(int)$idTax.','.(float)$unitAmount.','.
+ (float)$totalAmount.'),';
+ }
+ $values = rtrim($values, ',');
+ $sql = 'INSERT INTO `'._DB_PREFIX_.'htl_booking_demands_tax`
+ (id_booking_demand, id_tax, unit_amount, total_amount)
+ VALUES '.$values;
+
+ return Db::getInstance()->execute($sql);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * This method returns true if at least one booking demand uses One After Another tax computation method.
+ * @return bool
+ */
+ public function useOneAfterAnotherTaxComputationMethod()
+ {
+ // if one of the order details use the tax computation method the display will be different
+ return Db::getInstance()->getValue('
+ SELECT od.`tax_computation_method`
+ FROM `' . _DB_PREFIX_ . 'order_detail_tax` odt
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
+ WHERE od.`id_order` = ' . (int) $this->id_order . '
+ AND od.`id_order_invoice` = ' . (int) $this->id . '
+ AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD)
+ || Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
+ }
+
+ public function getExtraDemandsTaxesDetails($idOrder)
+ {
+ $taxDetails = Db::getInstance()->executeS(
+ 'SELECT hb.`id` as id_htl_booking, hbd.`unit_price_tax_excl`, hbd.`total_price_tax_excl`, hb.`id_order_detail`, hdt.*, t.* FROM '._DB_PREFIX_.'orders o '.
+ 'INNER JOIN '._DB_PREFIX_.'htl_booking_detail hb ON hb.id_order = o.id_order '.
+ 'INNER JOIN '._DB_PREFIX_.'htl_booking_demands hbd ON hbd.id_htl_booking = hb.id '.
+ 'INNER JOIN '._DB_PREFIX_.'htl_booking_demands_tax hdt ON hbd.id_booking_demand = hdt.id_booking_demand '.
+ 'INNER JOIN '._DB_PREFIX_.'tax t ON t.id_tax = hdt.id_tax '.
+ 'WHERE o.id_order = '.(int)$idOrder
+ );
+ if ($taxDetails) {
+ foreach ($taxDetails as &$detail) {
+ $priceTaxExcl = $detail['unit_price_tax_excl'];
+ $quantity = 1;
+ $objBkDemand = new HotelBookingDemands($detail['id_booking_demand']);
+ if ($objBkDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
+ $objBkDetail = new HotelBookingDetail($detail['id_htl_booking']);
+ $quantity = $objBkDetail->getNumberOfDays($objBkDetail->date_from, $objBkDetail->date_to);
+ }
+ switch (Configuration::get('PS_ROUND_TYPE')) {
+ case Order::ROUND_ITEM:
+ $unitAmount = (float)Tools::ps_round($priceTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
+ $totalTaxBase = $unitAmount * $quantity;
+ break;
+ case Order::ROUND_LINE:
+ $unitAmount = $priceTaxExcl;
+ $totalTaxBase = Tools::ps_round(
+ $unitAmount * $quantity,
+ _PS_PRICE_COMPUTE_PRECISION_
+ );
+ break;
+ case Order::ROUND_TOTAL:
+ $unitAmount = $priceTaxExcl;
+ $totalTaxBase = $unitAmount * $quantity;
+ break;
+ }
+ $detail['total_tax_base'] = $totalTaxBase;
+ }
+ }
+ return $taxDetails;
+ }
}
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index cd1de3f49..7d8438a25 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -194,8 +194,8 @@ public function getBookingData($params)
if ($id_cart && $id_guest) {
$sql = 'SELECT cbd.`id_product`, cbd.`id_room`, cbd.`id_hotel`, cbd.`booking_type`, cbd.`comment`, rf.`room_num`, cbd.`date_from`, cbd.`date_to`
FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd
- INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.id = cbd.id_room)
- WHERE cbd.id_hotel='.$hotel_id.' AND cbd.id_product ='.$room_type['id_product'].' AND cbd.id_cart = '.$id_cart.' AND cbd.id_guest ='.$id_guest.' AND cbd.is_refunded = 0 AND cbd.is_back_order = 0';
+ INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = cbd.`id_room`)
+ WHERE cbd.`id_hotel`='.(int)$hotel_id.' AND cbd.`id_product` ='.(int)$room_type['id_product'].' AND cbd.`id_cart` = '.(int)$id_cart.' AND cbd.`id_guest` ='.(int)$id_guest.' AND cbd.`is_refunded` = 0 AND cbd.`is_back_order` = 0';
$cart_rooms = Db::getInstance()->executeS($sql);
} else {
$cart_rooms = array();
@@ -204,21 +204,22 @@ public function getBookingData($params)
}
if ($search_booked) {
- $sql = 'SELECT bd.id_product, bd.id_room, bd.id_hotel, bd.id_customer, bd.booking_type, bd.id_status AS booking_status, bd.comment, rf.room_num, bd.date_from, bd.date_to
+ $sql = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment`, rf.`room_num`, bd.`date_from`, bd.`date_to`
FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd
- INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.id = bd.id_room)
- WHERE bd.id_hotel='.$hotel_id.' AND bd.id_product ='.$room_type['id_product']." AND bd.date_from <= '$date_from' AND bd.date_to >='$date_to' AND bd.is_refunded = 0 AND bd.is_back_order = 0";
+ INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`)
+ WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product` ='.(int)$room_type['id_product'].' AND bd.`is_refunded` = 0 AND bd.`is_back_order` = 0 AND IF(bd.`id_status` = 3, bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\', bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.date_to >= \''.pSQL($date_to).'\')';
$booked_rooms = Db::getInstance()->executeS($sql);
foreach ($booked_rooms as $booked_k => $booked_v) {
- $booked_rooms[$booked_k]['detail'][] = array('date_from' => $booked_v['date_from'],
- 'date_to' => $booked_v['date_to'],
- 'id_customer' => $booked_v['id_customer'],
- 'booking_type' => $booked_v['booking_type'],
- 'booking_status' => $booked_v['booking_status'],
- 'comment' => $booked_v['comment'],
- );
+ $booked_rooms[$booked_k]['detail'][] = array(
+ 'date_from' => $booked_v['date_from'],
+ 'date_to' => $booked_v['date_to'],
+ 'id_customer' => $booked_v['id_customer'],
+ 'booking_type' => $booked_v['booking_type'],
+ 'booking_status' => $booked_v['booking_status'],
+ 'comment' => $booked_v['comment'],
+ );
unset($booked_rooms[$booked_k]['date_from']);
unset($booked_rooms[$booked_k]['date_to']);
@@ -234,11 +235,11 @@ public function getBookingData($params)
if ($search_unavai) {
$sql1 = 'SELECT `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment`
FROM `'._DB_PREFIX_.'htl_room_information`
- WHERE `id_hotel`='.$hotel_id.' AND `id_product` ='.$room_type['id_product'].' AND `id_status` = 2';
+ WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product` ='.(int)$room_type['id_product'].' AND `id_status` = 2';
$sql2 = 'SELECT hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment`
FROM `'._DB_PREFIX_.'htl_room_information` AS hri
- INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.id_room_type = hri.id_product AND hrdd. id_room = hri.id)
+ INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd. id_room = hri.`id`)
WHERE hri.`id_hotel`='.$hotel_id.' AND hri.`id_product` ='.$room_type['id_product'].' AND hri.`id_status` = 3 AND hrdd.`date_from` <= \''.pSql($date_from).'\' AND hrdd.`date_to` >= \''.pSql($date_to).'\'';
$sql = $sql1.' UNION '.$sql2;
@@ -249,61 +250,78 @@ public function getBookingData($params)
if ($search_available) {
$exclude_ids = 'SELECT `id_room`
- FROM '._DB_PREFIX_."htl_booking_detail
- WHERE is_back_order = 0 AND is_refunded = 0 AND ((date_from <= '$date_from' AND date_to > '$date_from' AND date_to <= '$date_to') OR (date_from > '$date_from' AND date_to < '$date_to') OR (date_from >= '$date_from' AND date_from < '$date_to' AND date_to >= '$date_to') OR (date_from < '$date_from' AND date_to > '$date_to'))";
+ FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `is_back_order` = 0 AND `is_refunded` = 0 AND IF(`id_status` = 3, (
+ (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") <= \''.PSQL($date_to).'\') AND (
+ (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.PSQL($date_to).'\') OR
+ (`date_from` >= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.pSQL($date_to).'\') OR
+ (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `check_out` >= \''.pSQL($date_to).'\') OR
+ (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` >= \''.pSQL($date_to).'\')
+ )
+ ), (
+ (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` > \''.pSQL($date_from).'\' AND `date_to` <= \''.PSQL($date_to).'\') OR
+ (`date_from` >= \''.pSQL($date_from).'\' AND `date_to` <= \''.pSQL($date_to).'\') OR
+ (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `date_to` >= \''.pSQL($date_to).'\') OR
+ (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` >= \''.pSQL($date_to).'\')
+ ))';
if (!empty($id_cart) && !empty($id_guest)) {
$exclude_ids .= ' UNION
SELECT `id_room`
- FROM '._DB_PREFIX_.'htl_cart_booking_data
- WHERE id_cart='.$id_cart.' AND id_guest='.$id_guest." AND is_refunded = 0 AND is_back_order = 0 AND ((date_from <= '$date_from' AND date_to > '$date_from' AND date_to <= '$date_to') OR (date_from > '$date_from' AND date_to < '$date_to') OR (date_from >= '$date_from' AND date_from < '$date_to' AND date_to >= '$date_to') OR (date_from < '$date_from' AND date_to > '$date_to'))";
+ FROM `'._DB_PREFIX_.'htl_cart_booking_data`
+ WHERE id_cart='.(int)$id_cart.' AND id_guest='.(int)$id_guest.' AND is_refunded = 0 AND is_back_order = 0 AND ((date_from <= \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_from).'\' AND date_to <= \''.pSQL($date_to).'\') OR (date_from > \''.pSQL($date_from).'\' AND date_to < \''.pSQL($date_to).'\') OR (date_from >= \''.pSQL($date_from).'\' AND date_from < \''.pSQL($date_to).'\' AND date_to >= \''.pSQL($date_to).'\') OR (date_from < \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_to).'\'))';
}
// For excludes temporary disable rooms
$exclude_ids .= ' UNION
SELECT hri.`id` AS id_room
- FROM '._DB_PREFIX_.'htl_room_information AS hri
+ FROM `'._DB_PREFIX_.'htl_room_information` AS hri
INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`)
- WHERE hri.`id_hotel`='.$hotel_id.' AND hri.`id_product` ='.$room_type['id_product'].' AND hri.`id_status` = 3 AND (hrdd.`date_from` < \''.pSql($date_to).'\' AND hrdd.`date_to` > \''.pSql($date_from).'\')';
+ WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$room_type['id_product'].' AND hri.`id_status` = 3 AND (hrdd.`date_from` <= \''.pSql($date_to).'\' AND hrdd.`date_to` >= \''.pSql($date_from).'\')';
$sql = 'SELECT ri.`id` AS `id_room`, ri.`id_product`, ri.`id_hotel`, ri.`room_num`, ri.`comment` AS `room_comment`
- FROM `'._DB_PREFIX_.'htl_room_information` AS ri ';
- if ($adult || $children) {
- $sql .= 'INNER JOIN '._DB_PREFIX_.'htl_room_type AS rt ON (rt.id_product = ri.id_product AND rt.id_hotel = ri.id_hotel';
- if ($adult) {
- $sql .= ' AND rt.adult >= '.$adult;
- }
- if ($children) {
- $sql .= ' AND rt.children >= '.$children;
- }
- $sql .= ')';
- }
-
- $sql .= ' WHERE ri.id_hotel='.$hotel_id.' AND ri.id_product='.$room_type['id_product'].' AND ri.id_status != 2 AND ri.id NOT IN ('.$exclude_ids.')';
+ FROM `'._DB_PREFIX_.'htl_room_information` AS ri
+ WHERE ri.`id_hotel`='.(int)$hotel_id.' AND ri.`id_product`='.(int)$room_type['id_product'].' AND ri.`id_status` != 2 AND ri.`id` NOT IN ('.$exclude_ids.')';
$avai_rooms = Db::getInstance()->executeS($sql);
$num_avail += count($avai_rooms);
}
if ($search_partial) {
- $sql1 = "SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, bd.`date_to`
- FROM `"._DB_PREFIX_."htl_booking_detail` AS bd
- INNER JOIN `"._DB_PREFIX_."htl_room_information` AS rf ON (rf.`id` = bd.`id_room` AND rf.`id_status` = 1)
- WHERE bd.`id_hotel`=".$hotel_id." AND bd.`id_product`=".$room_type['id_product']." AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND ((bd.`date_from` <= '$date_from' AND bd.`date_to` > '$date_from' AND bd.`date_to` < '$date_to') OR (bd.`date_from` > '$date_from' AND bd.`date_from` < '$date_to' AND bd.`date_to` >= '$date_to') OR (bd.`date_from` > '$date_from' AND bd.`date_from` < '$date_to' AND bd.`date_to` < '$date_to'))";
-
- $sql2 = "SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, '0' AS `id_customer`, '0' AS `booking_type`, '0' AS `booking_status`, '0' AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to`
- FROM `"._DB_PREFIX_."htl_room_information` AS hri
- INNER JOIN `"._DB_PREFIX_."htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`)
- WHERE hri.`id_hotel`=".$hotel_id." AND hri.`id_product`=".$room_type['id_product']." AND hri.`id_status` = 3 AND ((hrdd.`date_from` <= '$date_from' AND hrdd.`date_to` > '$date_from' AND hrdd.`date_to` < '$date_to') OR (hrdd.`date_from` > '$date_from' AND hrdd.`date_from` < '$date_to' AND hrdd.`date_to` >= '$date_to') OR (hrdd.`date_from` > '$date_from' AND hrdd.`date_from` < '$date_to' AND hrdd.`date_to` < '$date_to'))";
- $sql = $sql1.' UNION '.$sql2;
-
- // NOTE:: Before code if written to user order by with union
- $sql = "SELECT s.*
- FROM (".$sql.") AS s
- ORDER BY s.`id_room`";
- // Ends Here
+ $sql1 = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, IF(bd.`id_status` = 3, bd.`check_out`, bd.`date_to`) AS `date_to`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd
+ INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`)
+ WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product`='.(int)$room_type['id_product'].' AND rf.`id_status` != 2 AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND IF(bd.`id_status` = 3, (
+ (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") < \''.PSQL($date_to).'\') AND (
+ (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\') OR
+ (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\') OR
+ (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\')
+ )
+ ), (
+ (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`date_to` > \''.pSQL($date_from).'\' AND bd.`date_to` < \''.pSQL($date_to).'\') OR
+ (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` >= \''.pSQL($date_to).'\') OR
+ (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` < \''.pSQL($date_to).'\')
+ ))';
+
+ $sql2 = 'SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, 0 AS `id_customer`, 0 AS `booking_type`, 0 AS `booking_status`, 0 AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to`
+ FROM `'._DB_PREFIX_.'htl_room_information` AS hri
+ INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`)
+ WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product`='.(int)$room_type['id_product'].' AND
+ hri.`id_status` = 3 AND (
+ (hrdd.`date_from` <= \''.pSQL($date_from).'\' AND hrdd.`date_to` > \''.pSQL($date_from).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\') OR
+ (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` >= \''.pSQL($date_to).'\') OR
+ (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\')
+ )';
+ // $part_arr2 = Db::getInstance()->executeS($sql2);
+ // $part_arr = array_merge($part_arr1 ? $part_arr1 : array(), $part_arr2 ? $part_arr2 : array());
+ $sql = $sql1.' UNION '.$sql2;
+ // NOTE:: Before code if written to use "ORDER BY" with union
+ $sql = 'SELECT s.*
+ FROM ('.$sql.') AS s
+ ORDER BY s.`id_room`';
$part_arr = Db::getInstance()->executeS($sql);
+
$partial_avai_rooms = array();
foreach ($part_arr as $pr_val) {
$partial_avai_rooms[$pr_val['id_room']]['id_product'] = $pr_val['id_product'];
@@ -484,14 +502,15 @@ public function getBookingData($params)
// This function algo is same as available rooms algo and it not similar to booked rooms algo.
public function chechRoomBooked($id_room, $date_from, $date_to)
{
- $sql = 'SELECT `id_product`, `id_order`, `id_cart`, `id_room`, `id_hotel`, `id_customer` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room` = '.$id_room." AND `is_back_order` = 0 AND `is_refunded` = 0 AND ((date_from <= '$date_from' AND date_to > '$date_from' AND date_to <= '$date_to') OR (date_from > '$date_from' AND date_to < '$date_to') OR (date_from >= '$date_from' AND date_from < '$date_to' AND date_to >= '$date_to') OR (date_from < '$date_from' AND date_to > '$date_to'))";
-
- $result = Db::getInstance()->getRow($sql);
- if ($result) {
- return $result;
- }
-
- return false;
+ $sql = 'SELECT `id_product`, `id_order`, `id_cart`, `id_room`, `id_hotel`, `id_customer`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room` = '.(int)$id_room.
+ ' AND `is_back_order` = 0 AND `is_refunded` = 0 AND ((date_from <= \''.pSQL($date_from).'\' AND date_to > \''.
+ pSQL($date_from).'\' AND date_to <= \''.pSQL($date_to).'\') OR (date_from > \''.pSQL($date_from).
+ '\' AND date_to < \''.pSQL($date_to).'\') OR (date_from >= \''.pSQL($date_from).'\' AND date_from < \''.
+ pSQL($date_to).'\' AND date_to >= \''.pSQL($date_to).'\') OR (date_from < \''.pSQL($date_from).
+ '\' AND date_to > \''.pSQL($date_to).'\'))';
+
+ return Db::getInstance()->getRow($sql);
}
/**
@@ -567,15 +586,12 @@ public function checkAllDatesCover($dateCheck, $id_room)
unset($this->allReqDates[$key]);
}
}
-
return true;
}
/**
* [getPartialRange :: To get array containing ].
- *
* @param [array] $dateArr [Array containing dates]
- *
* @return [array] [IF passed array of dates contains more than one date then returns ]
*/
public function getPartialRange($dateArr, $id_room = 0, $rm_data_key = false)
@@ -609,15 +625,6 @@ public function getNumberOfDays($dateFrom, $dateTo)
$startDate = new DateTime($dateFrom);
$endDate = new DateTime($dateTo);
$daysDifference = $startDate->diff($endDate)->days;
- /* $startTimeStamp = strtotime($dateFrom);
- $endTimeStamp = strtotime($dateTo);
-
- $timeDiff = abs($endTimeStamp - $startTimeStamp);*/
-
- /*$numberDays = $timeDiff / 86400; // 86400 seconds in one day
-
- // and you might want to convert to integer
- $numberDays = $numberDays;*/
return $daysDifference;
}
@@ -631,34 +638,42 @@ public function getNumberOfDays($dateFrom, $dateTo)
*/
public function getBookingDataByOrderId($order_id)
{
- $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.$order_id);
- if ($result) {
- return $result;
- }
-
- return false;
+ return Db::getInstance()->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int)$order_id
+ );
}
/**
* [updateBookingOrderStatusBYOrderId :: To update the order status of a room in the booking].
- *
* @param [int] $order_id [Id of the order]
* @param [int] $new_status [Id of the new status of the order to be updated]
* @param [int] $id_room [Id of the room which order status is to be ypdated]
- *
* @return [Boolean] [Returns true if successfully updated else returns false]
*/
public function updateBookingOrderStatusByOrderId($order_id, $new_status, $id_room, $date_from, $date_to)
{
$table = 'htl_booking_detail';
+ $currentDate = date('Y-m-d H:i:s');
+
if ($new_status == 2) {
- $data = array('id_status' => $new_status,'check_in' => date('Y-m-d'));
+ $data = array(
+ 'id_status' => $new_status,
+ 'check_in' => ($currentDate > $date_to ? $date_to : $currentDate)
+ );
} elseif ($new_status == 3) {
- $data = array('id_status' => $new_status,'check_out' => date('Y-m-d'));
+ $data = array(
+ 'id_status' => $new_status,
+ 'check_out' => ($currentDate > $date_to ? $date_to : $currentDate)
+ );
} else {
- $data = array('id_status' => $new_status);
+ $data = array(
+ 'id_status' => $new_status,
+ 'check_in' => '',
+ 'check_out' => ''
+ );
}
- $where = 'id_order = '.$order_id.' AND id_room = '.$id_room.' AND `date_from` = \''.pSQL($date_from).'\' AND `date_to` = \''.pSQL($date_to).'\'';
+ $where = 'id_order = '.(int)$order_id.' AND id_room = '.(int)$id_room.' AND `date_from` = \''.pSQL($date_from).'\' AND `date_to` = \''.pSQL($date_to).'\'';
+
return Db::getInstance()->update($table, $data, $where);
}
@@ -817,9 +832,16 @@ public function getAvailableRoomsForReallocation($date_from, $date_to, $room_typ
}
if (isset($current_admin_cart_id) && $current_admin_cart_id) {
- $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_hotel`='.$hotel_id.' AND `id_product`='.$room_type.' AND id_status = 1 AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_."htl_booking_detail` WHERE `date_from` < '$date_to' AND `date_to` > '$date_from' AND `is_refunded`=0 AND `is_back_order`=0) AND `id` NOT IN (SELECT `id_room` FROM `"._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.$current_admin_cart_id.')';
+ $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment`
+ FROM `'._DB_PREFIX_.'htl_room_information`
+ WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' AND id_status = 1
+ AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from` < \''.
+ pSQL($date_to).'\' AND `date_to` > \''.pSQL($date_from).'\' AND `is_refunded`=0 AND `is_back_order`=0)
+ AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.
+ (int)$current_admin_cart_id.')';
} else {
- $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_hotel`='.$hotel_id.' AND `id_product`='.$room_type.' AND id_status = 1 AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_."htl_booking_detail` WHERE `date_from` < '$date_to' AND `date_to` > '$date_from' AND `is_refunded`=0 AND `is_back_order`=0)";
+ $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment`
+ FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' AND id_status = 1 AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from` < \''.pSQL($date_to).'\' AND `date_to` > \''.pSQL($date_from).'\' AND `is_refunded`=0 AND `is_back_order`=0)';
}
$avail_rooms = Db::getInstance()->executeS($sql);
if ($avail_rooms) {
@@ -831,8 +853,7 @@ public function getAvailableRoomsForReallocation($date_from, $date_to, $room_typ
/**
* [getAvailableRoomsForSwaping :: Get the available rooms for the swapping of the selected room with another room].
- *
- * @param [date] $date_from[Start date of booking of the room to be swapped with available rooms]
+ * @param [date] $date_from [Start date of booking of the room to be swapped with available rooms]
* @param [date] $date_to [End date of booking of the room to be swapped with available rooms]
* @param [int] $room_type [Id of the product to which the room belongs to be swapped]
* @param [int] $hotel_id [Id of the Hotel to which the room belongs to be swapped]
@@ -841,19 +862,14 @@ public function getAvailableRoomsForReallocation($date_from, $date_to, $room_typ
*/
public function getAvailableRoomsForSwapping($date_from, $date_to, $room_type, $hotel_id, $id_room)
{
- $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_hotel`='.$hotel_id.' AND `id_product`='.$room_type.' AND `id_status` = 1 AND `id` IN ('.'SELECT `id_room` FROM `'._DB_PREFIX_."htl_booking_detail` WHERE `date_from` = '$date_from' AND `date_to` = '$date_to' AND `id_room`!=".$id_room.' AND `is_refunded`=0 AND `is_back_order`=0)';
+ $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.
+ ' AND `id_status` = 1 AND `id` IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from` = \''.pSQL($date_from).'\' AND `date_to` = \''.pSQL($date_to).'\' AND `id_room`!='.(int)$id_room.' AND `is_refunded`=0 AND `is_back_order`=0)';
- $avail_rooms = Db::getInstance()->executeS($sql);
- if ($avail_rooms) {
- return $avail_rooms;
- }
-
- return false;
+ return Db::getInstance()->executeS($sql);
}
/**
* [reallocateRoomWithAvailableSameRoomType :: To reallocate rooms with available rooms in case of reallocation of the room].
- *
* @param [int] $current_room_id [Id of the room to be reallocated]
* @param [date] $date_from [start date of the booking of the room]
* @param [date] $date_to [end date of the booking of the room]
@@ -868,7 +884,8 @@ public function reallocateRoomWithAvailableSameRoomType($current_room_id, $date_
$table = 'htl_booking_detail';
$table2 = 'htl_cart_booking_data';
$data = array('id_room' => $swapped_room_id);
- $where = "date_from='$date_from' AND date_to='$date_to' AND id_room=".$current_room_id;
+ $where = 'date_from=\''.pSQL($date_from).'\' AND date_to=\''.pSQL($date_to).'\' AND id_room='.
+ (int)$current_room_id;
$result = Db::getInstance()->update($table, $data, $where);
$result2 = Db::getInstance()->update($table2, $data, $where);
if ($result) {
@@ -876,16 +893,13 @@ public function reallocateRoomWithAvailableSameRoomType($current_room_id, $date_
if ($result2) {
return true;
}
-
return false;
}
-
return false;
}
/**
* [swapRoomWithAvailableSameRoomType :: To swap rooms with available rooms in case of reallocation of the room].
- *
* @param [int] $current_room_id [Id of the room to be swapped]
* @param [date] $date_from [start date of the booking of the room]
* @param [date] $date_to [end date of the booking of the room]
@@ -898,31 +912,41 @@ public function swapRoomWithAvailableSameRoomType($current_room_id, $date_from,
$date_from = date('Y-m-d H:i:s', strtotime($date_from));
$date_to = date('Y-m-d H:i:s', strtotime($date_to));
- $idcrt1 = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_."htl_cart_booking_data` WHERE `date_from`='$date_from' AND `date_to`='$date_to' AND `id_room`=".$swapped_room_id);
- $idcrt2 = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_."htl_cart_booking_data` WHERE `date_from`='$date_from' AND `date_to`='$date_to' AND `id_room`=".$current_room_id);
-
- $id1 = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_."htl_booking_detail` WHERE `date_from`='$date_from' AND `date_to`='$date_to' AND `id_room`=".$swapped_room_id);
- $id2 = Db::getInstance()->getValue('SELECT `id` FROM `'._DB_PREFIX_."htl_booking_detail` WHERE `date_from`='$date_from' AND `date_to`='$date_to' AND `id_room`=".$current_room_id);
-
- $sql = 'UPDATE `'._DB_PREFIX_.'htl_cart_booking_data` SET `id_room`=IF(`id`='.$idcrt1.','.$current_room_id.','.$swapped_room_id.') WHERE `id` IN('.$idcrt1.','.$idcrt2.')';
- $sql1 = 'UPDATE `'._DB_PREFIX_.'htl_booking_detail` SET `id_room`=IF(`id`='.$id1.','.$current_room_id.','.$swapped_room_id.') WHERE `id` IN('.$id1.','.$id2.')';
-
- $result = Db::getInstance()->execute($sql);
- if ($result) {
+ $idcrt1 = Db::getInstance()->getValue(
+ 'SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `date_from`=\''.pSQL($date_from).
+ '\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$swapped_room_id
+ );
+ $idcrt2 = Db::getInstance()->getValue(
+ 'SELECT `id` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `date_from`=\''.pSQL($date_from).
+ '\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$current_room_id
+ );
+
+ $id1 = Db::getInstance()->getValue(
+ 'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
+ '\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$swapped_room_id
+ );
+ $id2 = Db::getInstance()->getValue(
+ 'SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from`=\''.pSQL($date_from).
+ '\' AND `date_to`=\''.pSQL($date_to).'\' AND `id_room`='.(int)$current_room_id
+ );
+ $sql = 'UPDATE `'._DB_PREFIX_.'htl_cart_booking_data` SET `id_room`=IF(`id`='.(int)$idcrt1.','.
+ (int)$current_room_id.','.(int)$swapped_room_id.') WHERE `id` IN('.(int)$idcrt1.','.(int)$idcrt2.')';
+
+ $sql1 = 'UPDATE `'._DB_PREFIX_.'htl_booking_detail` SET `id_room`=IF(`id`='.(int)$id1.','.(int)$current_room_id.
+ ','.(int)$swapped_room_id.') WHERE `id` IN('.(int)$id1.','.(int)$id2.')';
+
+ if ($result = Db::getInstance()->execute($sql)) {
$result2 = Db::getInstance()->execute($sql1);
if ($result2) {
return true;
}
-
return false;
}
-
return false;
}
/**
* [updateOrderRefundStatus :: To update the refund status of a room booked in the order if amount refunded by the admin].
- *
* @param [int] $id_order [Id of the order]
* @param [date] $date_from [start date of the bookin of the room]
* @param [date] $date_to [end date of the bookin of the room]
@@ -935,10 +959,10 @@ public function updateOrderRefundStatus($id_order, $date_from, $date_to, $id_roo
$table = 'htl_booking_detail';
$data = array('is_refunded' => 1);
foreach ($id_rooms as $key_rm => $val_rm) {
- $where = '`id_order` = '.$id_order.' AND `id_room` = '.$val_rm['id_room']." AND `date_from` = '$date_from' AND `date_to` = '$date_to'";
+ $where = 'id_order='.(int)$id_order.' AND id_room = '.(int)$val_rm['id_room'].' AND `date_from`= \''.
+ pSQL($date_from).'\' AND `date_to` = \''.pSQL($date_to).'\'';
$result = Db::getInstance()->update($table, $data, $where);
}
-
return $result;
}
@@ -955,7 +979,6 @@ public static function useTax()
} elseif ($priceDisplay == 1) {
$price_tax = false;
}
-
return $price_tax;
}
@@ -969,18 +992,13 @@ public static function useTax()
*/
public function getPsOrderDetailsByProduct($id_product, $id_order)
{
- $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.$id_order.' AND `product_id`='.$id_product;
- $result = Db::getInstance()->executeS($sql);
- if ($result) {
- return $result;
- }
-
- return false;
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.(int)$id_order.' AND `product_id`='.
+ (int)$id_product;
+ return Db::getInstance()->executeS($sql);
}
/**
* [deleteRoomFromOrder : Deletes a row from the table with the supplied conditions].
- *
* @param [int] $id_order [Id of the order]
* @param [int] $id_room [id_of the room]
* @param [date] $date_from [Start date of the booking]
@@ -990,26 +1008,40 @@ public function getPsOrderDetailsByProduct($id_product, $id_order)
*/
public function deleteOrderedRoomFromOrder($id_order, $id_hotel, $id_room, $date_from, $date_to)
{
- $delete = Db::getInstance()->delete('htl_booking_detail', '`id_order`='.(int) $id_order.' AND `id_hotel`='.(int) $id_hotel.' AND `id_room`='.(int) $id_room." AND `date_from`='$date_from' AND `date_to`='$date_to'");
+ return Db::getInstance()->delete(
+ 'htl_booking_detail',
+ '`id_order`='.(int) $id_order.' AND `id_hotel`='.(int) $id_hotel.' AND `id_room`='.(int) $id_room.
+ ' AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`=\''.pSQL($date_to).'\''
+ );
return $delete;
}
- public function getRoomBookinInformationForDateRangeByOrder($id_room, $old_date_from, $old_date_to, $new_date_from, $new_date_to)
- {
- $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.$id_room." AND `date_from` < '$new_date_to' AND `date_to` > '$new_date_from' AND `date_from` != '$old_date_from' AND `date_to` != '$old_date_to' AND `is_refunded`=0 AND `is_back_order`=0";
- $result = Db::getInstance()->executeS($sql);
- if ($result) {
- return $result;
- }
+ public function getRoomBookinInformationForDateRangeByOrder(
+ $id_room,
+ $old_date_from,
+ $old_date_to,
+ $new_date_from,
+ $new_date_to
+ ) {
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.(int)$id_room.
+ ' AND `date_from` < \''.pSQL($new_date_to).'\' AND `date_to` > \''.pSQL($new_date_from).
+ '\' AND `date_from` != \''.pSQL($old_date_from).'\' AND `date_to` != \''.pSQL($old_date_to).
+ '\' AND `is_refunded`=0 AND `is_back_order`=0';
- return false;
+ return Db::getInstance()->executeS($sql);
}
- public function UpdateHotelCartHotelOrderOnOrderEdit($id_order, $id_room, $old_date_from, $old_date_to, $new_date_from, $new_date_to)
- {
- $rowByIdOrderIdRoom = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.$id_room.' AND `id_order`='.$id_order);
- $numDays = $this->getNumberOfDays($old_date_from, $old_date_to);
+ public function UpdateHotelCartHotelOrderOnOrderEdit(
+ $id_order,
+ $id_room,
+ $old_date_from,
+ $old_date_to,
+ $new_date_from,
+ $new_date_to
+ ) {
+ $rowByIdOrderIdRoom = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.(int)$id_room.' AND `id_order`='.(int)$id_order);
+ $numDays = $this->getNumberOfDays($old_date_from, $old_date_to);
$paidUnitRoomPriceTE = $rowByIdOrderIdRoom['total_price_tax_excl']/$numDays;
$paidUnitRoomPriceTI = $rowByIdOrderIdRoom['total_price_tax_incl']/$numDays;
@@ -1020,9 +1052,20 @@ public function UpdateHotelCartHotelOrderOnOrderEdit($id_order, $id_room, $old_d
$table = 'htl_cart_booking_data';
$table1 = 'htl_booking_detail';
$num_days = $this->getNumberOfDays($new_date_from, $new_date_to);
- $data_cart = array('date_from' => $new_date_from,'date_to' => $new_date_to,'quantity' => $num_days);
- $data_order = array('date_from' => $new_date_from,'date_to' => $new_date_to, 'total_price_tax_excl' => $newTotalPriceTE,'total_price_tax_incl' => $newTotalPriceTI);
- $where = 'id_order = '.$id_order.' AND id_room = '.$id_room." AND date_from = '$old_date_from' AND date_to = '$old_date_to' AND `is_refunded`=0 AND `is_back_order`=0";
+ $data_cart = array(
+ 'date_from' => $new_date_from,
+ 'date_to' => $new_date_to,
+ 'quantity' => $num_days
+ );
+ $data_order = array(
+ 'date_from' => $new_date_from,
+ 'date_to' => $new_date_to,
+ 'total_price_tax_excl' => $newTotalPriceTE,
+ 'total_price_tax_incl' => $newTotalPriceTI
+ );
+
+ $where = 'id_order = '.(int)$id_order.' AND id_room = '.(int)$id_room.' AND date_from= \''.pSQL($old_date_from).
+ '\' AND date_to = \''.pSQL($old_date_to).'\' AND `is_refunded`=0 AND `is_back_order`=0';
$result = Db::getInstance()->update($table, $data_cart, $where);
@@ -1033,45 +1076,31 @@ public function UpdateHotelCartHotelOrderOnOrderEdit($id_order, $id_room, $old_d
/**
* [getPsOrderDetailIdByIdProduct :: Returns id_order_details accoording to the product and order Id].
- *
* @param [int] $id_product [Id of the product]
* @param [int] $id_order [Id of the order]
- *
* @return [int|false] [If found id_order_detail else returns false]
*/
public function getPsOrderDetailIdByIdProduct($id_product, $id_order)
{
- $sql = 'SELECT `id_order_detail` FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.$id_order.' AND `product_id`='.$id_product;
- $result = Db::getInstance()->getvalue($sql);
- if ($result) {
- return $result;
- }
-
- return false;
+ $sql = 'SELECT `id_order_detail` FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.(int)$id_order.' AND `product_id`='.(int)$id_product;
+ return Db::getInstance()->getvalue($sql);
}
/**
* [getOrderCurrentDataByOrderId :: To get booking information of the order by Order id].
- *
* @param [int] $id_order [Id of the order]
- *
* @return [array|false] [If data found Returns the array containing the information of the cart of the passed order id else returns false]
*/
public function getOrderCurrentDataByOrderId($id_order)
{
- $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.$id_order);
- if ($result) {
- return $result;
- } else {
- return false;
- }
+ return Db::getInstance()->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int)$id_order
+ );
}
/**
* [getOrderFormatedBookinInfoByIdOrder : To get Order booking information with some additional information in a custom famated way].
- *
* @param [Int] $id_order [Id of the order]
- *
* @return [Array|false] [If data found returns cart booking information with some additional information else returns false]
*/
public function getOrderFormatedBookinInfoByIdOrder($id_order)
@@ -1124,7 +1153,6 @@ public function getOrderFormatedBookinInfoByIdOrder($id_order)
if ($order_detail_data) {
return $order_detail_data;
}
-
return false;
}
@@ -1137,30 +1165,28 @@ public function getOrderFormatedBookinInfoByIdOrder($id_order)
*/
public function getLastInsertedIdOrderDetail($id_order)
{
- $result = Db::getInstance()->getValue('SELECT MAX(`id_order_detail`) FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.$id_order);
- if ($result) {
- return $result;
- } else {
- return false;
- }
+ return Db::getInstance()->getValue(
+ 'SELECT MAX(`id_order_detail`) FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.(int)$id_order
+ );
}
/**
* [getOnlyOrderBookingData description].
- *
* @param [type] $id_order [description]
* @param [type] $id_guest [description]
* @param [type] $id_product [description]
* @param int $id_customer [description]
- *
* @return [type] [description]
*/
public function getOnlyOrderBookingData($id_order, $id_guest, $id_product, $id_customer = 0)
{
- $sql = 'SELECT hbd.*, od.`unit_price_tax_incl`, od.`unit_price_tax_excl`, od.`reduction_amount_tax_excl`, od.`reduction_amount_tax_incl` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd INNER JOIN `'._DB_PREFIX_.'order_detail` od ON (od.id_order_detail = hbd.id_order_detail) WHERE hbd.`id_order` = '.$id_order.' AND hbd.`id_product` = '.$id_product;
+ $sql = 'SELECT hbd.*, od.`unit_price_tax_incl`, od.`unit_price_tax_excl`, od.`reduction_amount_tax_excl`,
+ od.`reduction_amount_tax_incl` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ INNER JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = hbd.`id_order_detail`)
+ WHERE hbd.`id_order` = '.(int)$id_order.' AND hbd.`id_product` = '.(int)$id_product;
if ($id_customer) {
- $sql .= ' AND hbd.`id_customer` = '.$id_customer;
+ $sql .= ' AND hbd.`id_customer` = '.(int)$id_customer;
}
return Db::getInstance()->executeS($sql);
}
@@ -1173,7 +1199,10 @@ public function getOnlyOrderBookingData($id_order, $id_guest, $id_product, $id_c
*/
public static function getOrderInfoIdOrderIdProduct($id_order, $id_product)
{
- return Db::getInstance()->executeS("SELECT * FROM `"._DB_PREFIX_."htl_booking_detail` WHERE `id_order`=".(int) $id_order." AND `id_product`=".(int) $id_product);
+ return Db::getInstance()->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `id_order`='.(int) $id_order.' AND `id_product`='.(int) $id_product
+ );
}
/**
@@ -1186,7 +1215,11 @@ public static function getOrderInfoIdOrderIdProduct($id_order, $id_product)
*/
public function getCustomerIdRoomsByIdOrderIdProduct($id_order, $id_product, $date_from, $date_to)
{
- return Db::getInstance()->executeS('SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int) $id_order.' AND `id_product`='.(int) $id_product.' AND `date_from`=\''.$date_from.'\' AND `date_to`= \''.$date_to.'\'');
+ return Db::getInstance()->executeS(
+ 'SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `id_order`='.(int)$id_order.' AND `id_product`='.(int)$id_product.
+ ' AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`= \''.pSQL($date_to).'\''
+ );
}
/**
@@ -1197,7 +1230,10 @@ public function getCustomerIdRoomsByIdOrderIdProduct($id_order, $id_product, $da
*/
public function getBookedRoomsByIdOrderDetail($id_order_detail, $id_product)
{
- return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order_detail`='.(int) $id_order_detail.' AND `id_product`='.(int) $id_product);
+ return Db::getInstance()->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `id_order_detail`='.(int)$id_order_detail.' AND `id_product`='.(int)$id_product
+ );
}
/**
@@ -1456,11 +1492,9 @@ public function deleteHotelOrderInfo($id_order)
{
$cartTable = 'htl_cart_booking_data';
$orderTable = 'htl_booking_detail';
- $condition = 'id_order = '.$id_order;
+ $condition = 'id_order = '.(int)$id_order;
if (Db::getInstance()->delete($orderTable, $condition)) {
- if (Db::getInstance()->delete($cartTable, $condition)) {
- return true;
- }
+ return Db::getInstance()->delete($cartTable, $condition);
}
return false;
}
@@ -1469,11 +1503,9 @@ public function deleteHotelOrderRoomInfo($id_order, $id_product, $id_room)
{
$cartTable = 'htl_cart_booking_data';
$orderTable = 'htl_booking_detail';
- $condition = 'id_order = '.$id_order.' AND id_product = '.$id_product.' AND id_room = '.$id_room;
+ $condition = 'id_order = '.(int)$id_order.' AND id_product = '.(int)$id_product.' AND id_room = '.(int)$id_room;
if (Db::getInstance()->delete($orderTable, $condition)) {
- if (Db::getInstance()->delete($cartTable, $condition)) {
- return true;
- }
+ return Db::getInstance()->delete($cartTable, $condition);
}
return false;
}
@@ -1482,11 +1514,9 @@ public function deleteHotelOrderRoomTypeInfo($id_order, $id_product)
{
$cartTable = 'htl_cart_booking_data';
$orderTable = 'htl_booking_detail';
- $condition = 'id_order = '.$id_order.' AND id_product = '.$id_product;
+ $condition = 'id_order = '.(int)$id_order.' AND id_product = '.(int)$id_product;
if (Db::getInstance()->delete($orderTable, $condition)) {
- if (Db::getInstance()->delete($cartTable, $condition)) {
- return true;
- }
+ return Db::getInstance()->delete($cartTable, $condition);
}
return false;
}
@@ -1542,11 +1572,10 @@ public function updateHotelOrderRoomDurationInfo($id_order, $id_product, $id_roo
{
$cartTable = 'htl_cart_booking_data';
$orderTable = 'htl_booking_detail';
- $condition = '`id_order` = '.$id_order.' AND `id_product` = '.$id_product.' AND `id_room` = '.$id_room;
+ $condition = '`id_order` = '.(int)$id_order.' AND `id_product` = '.(int)$id_product.
+ ' AND `id_room` = '.(int)$id_room;
if (Db::getInstance()->update($orderTable, $update_params, $condition)) {
- if (Db::getInstance()->update($cartTable, $update_params, $condition)) {
- return true;
- }
+ return Db::getInstance()->update($cartTable, $update_params, $condition);
}
return false;
}
@@ -1585,7 +1614,11 @@ public function updateProductQuantityInPsOrderDetail($id_order, $id_product, $qu
// Add new entry to the table
if ($orderDetail->save()) {
- return Db::getInstance()->update('htl_booking_detail', array('id_order_detail' => $orderDetail->id_order_detail), '`id_order` = '.$id_order.' AND `id_product` = '.$id_product);
+ return Db::getInstance()->update(
+ 'htl_booking_detail',
+ array('id_order_detail' => $orderDetail->id_order_detail),
+ '`id_order` = '.(int)$id_order.' AND `id_product` = '.(int)$id_product
+ );
}
}
return false;
@@ -1601,6 +1634,19 @@ public function updateProductQuantityInPsOrderDetail($id_order, $id_product, $qu
*/
public function getRowByIdOrderIdProductInDateRange($id_order, $id_product, $date_from, $date_to)
{
- return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int) $id_order.' AND `id_product`='.(int) $id_product.' AND `date_from`=\''.$date_from.'\' AND `date_to`= \''.$date_to.'\'');
+ return Db::getInstance()->getRow(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `id_order`='.(int)$id_order.' AND `id_product`='.(int)$id_product.
+ ' AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`= \''.pSQL($date_to).'\''
+ );
+ }
+
+ public function getRoomBookingData($idRoom, $idOrder)
+ {
+ $sql = 'SELECT `id_product`, `id_order_detail`, `id_hotel`, `id_customer`, `booking_type`, `id_status`, `check_in`, `check_out`
+ FROM `'._DB_PREFIX_.'htl_booking_detail`
+ WHERE `id_order`='.(int)$idOrder.' AND `id_room`='.(int)$idRoom;
+
+ return Db::getInstance()->getRow($sql);
}
}
diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
index 375f83745..5252186cd 100644
--- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php
+++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
@@ -92,6 +92,179 @@ public function __construct($id = null, $id_lang = null, $id_shop = null)
parent::__construct($id, $id_lang, $id_shop);
}
+ public function add($autodate = true, $null_values = false)
+ {
+ // Add tab
+ if (parent::add($autodate, $null_values)) {
+ // insert accesses of the hotel
+ return self::initAccess($this->id);
+ }
+ return false;
+ }
+
+ /** When creating a new hotel $idHotel, this add default rights to the table access
+ * @param int $idHotel
+ * @param Context $context
+ * @return bool true if succeed
+ */
+ protected function initAccess($idHotel, Context $context = null)
+ {
+ if (!$context) {
+ $context = Context::getContext();
+ }
+ if (!$context->employee || !$context->employee->id_profile) {
+ return false;
+ }
+ /* Profile selection */
+ $profiles = Db::getInstance()->executeS('SELECT `id_profile` FROM '._DB_PREFIX_.'profile WHERE `id_profile` != 1');
+ if (!$profiles || empty($profiles)) {
+ return true;
+ }
+ /* Query definition */
+ $query = 'REPLACE INTO `'._DB_PREFIX_.'htl_access` (`id_profile`, `id_hotel`, `access`)';
+ $query .= ' VALUES '.'(1, '.(int)$idHotel.', 1),';
+
+ foreach ($profiles as $profile) {
+ $access = ($profile['id_profile'] == $context->employee->id_profile) ? 1 : 0;
+ $query .= ' ('.(int)$profile['id_profile'].', '.(int)$idHotel.', '.(int)$access.'),';
+ }
+ $query = trim($query, ', ');
+ return Db::getInstance()->execute($query);
+ }
+
+ // Add profile hotel access while profile is added
+ public function addHotelsAccessToProfile($idProfile)
+ {
+ return Db::getInstance()->execute(
+ 'INSERT INTO '._DB_PREFIX_.'htl_access (SELECT '.(int)$idProfile.', id, 0 FROM '
+ ._DB_PREFIX_.'htl_branch_info)'
+ );
+ }
+
+ // Add profile hotel access while profile is deleted
+ public function deleteProfileHotelsAccess($idProfile)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE FROM `'._DB_PREFIX_.'htl_access` WHERE `id_profile` = '.(int)$idProfile
+ );
+ }
+
+ /**
+ * get profile accessed hotels
+ * @param [type] $idProfile
+ * @param integer $access send 1 for allowed, 0 for not allowed and 2 form all
+ * @param integer $onlyhotelIds send 1 if only hotel ids needed
+ * @return [hotelaccessInfo or id_hotel array]
+ */
+ public static function getProfileAccessedHotels($idProfile, $access = 2, $onlyhotelIds = 0)
+ {
+ $sql = 'SELECT `id_hotel` FROM `'._DB_PREFIX_.'htl_access` WHERE `id_profile` = '.(int)$idProfile;
+ if ($access != 2) {
+ $sql .= ' AND access = 1';
+ }
+ if ($hotelAccessInfo = Db::getInstance()->executeS($sql)) {
+ if ($onlyhotelIds) {
+ $hotels = array();
+ foreach ($hotelAccessInfo as $hotel) {
+ $hotels[] = $hotel['id_hotel'];
+ }
+ return $hotels;
+ }
+ }
+ return $hotelAccessInfo;
+ }
+
+ // Add profile hotel access while profile is deleted
+ public function getHotelAccess($idHotel)
+ {
+ return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
+ 'SELECT * FROM `'._DB_PREFIX_.'htl_access` WHERE `id_hotel` = '.(int)$idHotel
+ );
+ }
+
+ /**
+ * Filter associative array containing id_hotel or id prodcut as per the hotels access
+ * @param [array] $data : associative array containing id_hotel or id prodcut in its elements
+ * @param [int] $idProfile : id profile as pe which we have to filter data of hotel access
+ * @param [int] $idAsIdHotel : consider id key in the array as id_hotel
+ * @param [int] $idAsIdProduct : consider id key in the array as id_product
+ * @param [int] $addAccessKey : Dont unset but set a key which define the access by hotels
+ * @return [array or false]
+ */
+ public static function filterDataByHotelAccess(
+ $dataArray,
+ $idProfile,
+ $idAsIdHotel = 0,
+ $idAsIdProduct = 0,
+ $addAccessKey = 0
+ ) {
+ if ($hotelAccessInfo = Db::getInstance()->executeS(
+ 'SELECT `id_hotel` FROM `'._DB_PREFIX_.'htl_access` WHERE access = 1 AND `id_profile` = '.(int)$idProfile
+ )) {
+ $hotels = array();
+ foreach ($hotelAccessInfo as $hotel) {
+ $hotels[] = $hotel['id_hotel'];
+ }
+ if ($hotels) {
+ foreach ($dataArray as $key => $row) {
+ if (isset($row['id_hotel'])) {
+ if ($addAccessKey) {
+ $dataArray[$key]['htl_access'] = 0;
+ if (in_array($row['id_hotel'], $hotels)) {
+ $dataArray[$key]['htl_access'] = 1;
+ }
+ } else {
+ if (!in_array($row['id_hotel'], $hotels)) {
+ unset($dataArray[$key]);
+ }
+ }
+ } elseif ($idAsIdHotel && isset($row['id'])) {
+ if ($addAccessKey) {
+ $dataArray[$key]['htl_access'] = 0;
+ if (in_array($row['id'], $hotels)) {
+ $dataArray[$key]['htl_access'] = 1;
+ }
+ } else {
+ if (!in_array($row['id'], $hotels)) {
+ unset($dataArray[$key]);
+ }
+ }
+ } elseif ($idAsIdProduct && isset($row['id'])) {
+ $objRoomType = new HotelRoomType();
+ if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($row['id'])) {
+ if ($addAccessKey) {
+ $dataArray[$key]['htl_access'] = 0;
+ if (in_array($roomTypeInfo['id_hotel'], $hotels)) {
+ $dataArray[$key]['htl_access'] = 1;
+ }
+ } else {
+ if (!in_array($roomTypeInfo['id_hotel'], $hotels)) {
+ unset($dataArray[$key]);
+ }
+ }
+ }
+ } elseif (isset($row['id_product'])) {
+ $objRoomType = new HotelRoomType();
+ if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($row['id_product'])) {
+ if ($addAccessKey) {
+ $dataArray[$key]['htl_access'] = 0;
+ if (in_array($roomTypeInfo['id_hotel'], $hotels)) {
+ $dataArray[$key]['htl_access'] = 1;
+ }
+ } else {
+ if (!in_array($roomTypeInfo['id_hotel'], $hotels)) {
+ unset($dataArray[$key]);
+ }
+ }
+ }
+ }
+ }
+ return $dataArray;
+ }
+ }
+ return array();
+ }
+
// Web Services Code
public function getWsDefaultCurrencyCode()
{
@@ -348,30 +521,6 @@ public function addCategory($name, $parent_cat = false, $group_ids, $ishotel = f
if (!$parent_cat) {
$parent_cat = Category::getRootCategory()->id;
}
- // if ($ishotel && $idHotel) {
- // if ($catIdHotel = Db::getInstance()->getValue(
- // 'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id = '.(int)$idHotel
- // )) {
- // $category = new Category($catIdHotel);
- // foreach (Language::getLanguages(true) as $lang) {
- // if (is_array($name) && isset($name[$lang['id_lang']])) {
- // $catName = $name[$lang['id_lang']];
- // } else {
- // $catName = $name;
- // }
- // $category->name[$lang['id_lang']] = $catName;
- // $category->description[$lang['id_lang']] = $this->moduleInstance->l(
- // 'Hotel Branch Category',
- // 'HotelBranchInformation'
- // );
- // $category->link_rewrite[$lang['id_lang']] = Tools::link_rewrite($catName);
- // }
- // $category->id_parent = $parent_cat;
- // $category->groupBox = $group_ids;
- // $category->save();
- // return $category->id;
- // }
- // }
if (is_array($name) && isset($name[Configuration::get('PS_LANG_DEFAULT')])) {
$catName = $name[Configuration::get('PS_LANG_DEFAULT')];
} else {
@@ -455,8 +604,11 @@ public function delete()
}
}
if (!count($contextController->errors)) {
- if ($result = parent::delete()) {
- return $result;
+ // delete accesses of the hotel
+ if (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'htl_access WHERE `id_hotel` = '.(int)$this->id)
+ && parent::delete()
+ ) {
+ return true;
}
} else {
return false;
diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index 4a13c560a..7382a94a7 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -565,9 +565,7 @@ public function updateCartBookingData($updData, $updBy)
/**
* [getCartFormatedBookinInfoByIdCart : To get cart booking information with some additional information in a custom famated way].
- *
* @param [Int] $id_cart [Id of the cart]
- *
* @return [Array|false] [If data found returns cart booking information with some additional information else returns false]
*/
public function getCartFormatedBookinInfoByIdCart($id_cart)
@@ -575,6 +573,7 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
$context = Context::getContext();
$cart_detail_data = $this->getCartCurrentDataByCartId((int) $id_cart);
if ($cart_detail_data) {
+ $objRoomDemands = new HotelRoomTypeDemand();
foreach ($cart_detail_data as $key => $value) {
$product_image_id = Product::getCover($value['id_product']);
@@ -595,13 +594,37 @@ public function getCartFormatedBookinInfoByIdCart($id_cart)
$cart_detail_data[$key]['date_to'] = $value['date_to'];
$unit_price = Product::getPriceStatic($value['id_product'], true);
+ $unit_price_tax_excl = Product::getPriceStatic($value['id_product'], false);
$productPriceWithoutReduction = $productObj->getPriceWithoutReduct(false);
$feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($value['id_product'], $value['date_from'], $value['date_to'], true);
+ $feature_price_tax_excl = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($value['id_product'], $value['date_from'], $value['date_to'], false);
$feature_price_diff = (float)($productPriceWithoutReduction - $feature_price);
$cart_detail_data[$key]['product_price'] = $unit_price;
+ $cart_detail_data[$key]['product_price_tax_excl'] = $unit_price_tax_excl;
$cart_detail_data[$key]['feature_price'] = $feature_price;
+ $cart_detail_data[$key]['feature_price_tax_excl'] = $feature_price_tax_excl;
$cart_detail_data[$key]['feature_price_diff'] = $feature_price_diff;
-
+ // add extra demands
+ $cart_detail_data[$key]['extra_demands'] = $objRoomDemands->getRoomTypeDemands(
+ $value['id_product']
+ );
+ $cart_detail_data[$key]['selected_demands'] = $this->getCartExtraDemands(
+ $id_cart,
+ $value['id_product'],
+ $value['id_room'],
+ $value['date_from'],
+ $value['date_to'],
+ 0,
+ 1
+ );
+ $cart_detail_data[$key]['demand_price'] = $this->getCartExtraDemands(
+ $id_cart,
+ $value['id_product'],
+ $value['id_room'],
+ $value['date_from'],
+ $value['date_to'],
+ 1
+ );
// By webkul New way to calculate product prices with feature Prices
$roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($value['id_product'], $value['date_from'], $value['date_to']);
@@ -684,11 +707,13 @@ public function getProductFeaturePricePlanByDateByPriority($id_product, $date)
return $featurePrice;
}
} elseif ($priority == 'special_day') {
- $featurePrice = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_room_type_feature_pricing` WHERE `id_product`='.(int) $id_product.' AND `is_special_days_exists`=1 AND `active`=1 AND `date_from` <= \''.$date.'\' AND `date_to` >= \''.$date.'\'');
+ $featurePrice = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_type_feature_pricing` WHERE `id_product`='.(int) $id_product.' AND `is_special_days_exists`=1 AND `active`=1 AND `date_from` <= \''.$date.'\' AND `date_to` >= \''.$date.'\'');
if ($featurePrice) {
- $specialDays = Tools::jsonDecode($featurePrice['special_days']);
- if (in_array(strtolower(date('D', strtotime($date))), $specialDays)) {
- return $featurePrice;
+ foreach ($featurePrice as $fRow) {
+ $specialDays = Tools::jsonDecode($fRow['special_days']);
+ if (in_array(strtolower(date('D', strtotime($date))), $specialDays)) {
+ return $fRow;
+ }
}
}
} elseif ($priority == 'date_range') {
@@ -967,8 +992,13 @@ public function getCartExtraDemands(
$idRoom = 0,
$dateFrom = 0,
$dateTo = 0,
- $getTotalPrice = 0
+ $getTotalPrice = 0,
+ $onlyRoomDemands = 0,
+ $useTax = null
) {
+ if ($useTax === null) {
+ $useTax = HotelBookingDetail::useTax();
+ }
$context = Context::getContext();
if (isset($context->currency->id)
&& Validate::isLoadedObject($context->currency)
@@ -981,8 +1011,7 @@ public function getCartExtraDemands(
if ($getTotalPrice) {
$totalDemandsPrice = 0;
}
- $sql = 'SELECT `id`, `id_product`, `id_room`, `extra_demands` FROM `'._DB_PREFIX_.'htl_cart_booking_data`
- WHERE 1';
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE 1';
if ($idCart) {
$sql .= ' AND `id_cart`='.(int) $idCart;
}
@@ -995,23 +1024,88 @@ public function getCartExtraDemands(
if ($dateFrom && $dateTo) {
$sql .= ' AND `date_from` = \''.pSQL($dateFrom).'\' AND `date_to` = \''.pSQL($dateTo).'\'';
}
- if ($roomTypeDemands = Db::getInstance()->executeS($sql)) {
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($roomTypeDemands as &$demand) {
+ //if ($idCart && ($idRoom || ($idProduct && $dateFrom && $dateTo))) {
+ if ($onlyRoomDemands) {
+ if ($roomTypeDemands = Db::getInstance()->getRow($sql)) {
+ $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
+
if ($getTotalPrice) {
- if ($demand['extra_demands']
- && ($extraDemand = Tools::jsonDecode($demand['extra_demands'], true))
+ if ($roomTypeDemands['extra_demands']
+ && ($extraDemand = Tools::jsonDecode($roomTypeDemands['extra_demands'], true))
) {
$totalDemandsPrice += $objRoomDemandPrice->getRoomTypeDemandsTotalPrice(
- $demand['id_product'],
- $extraDemand
+ $roomTypeDemands['id_product'],
+ $extraDemand,
+ $useTax,
+ $roomTypeDemands['date_from'],
+ $roomTypeDemands['date_to']
);
}
} else {
- $demand['extra_demands'] = Tools::jsonDecode(
- $demand['extra_demands'],
+ $roomTypeDemands['extra_demands'] = Tools::jsonDecode(
+ $roomTypeDemands['extra_demands'],
true
);
+ if (isset($roomTypeDemands['extra_demands']) && $roomTypeDemands['extra_demands']) {
+ foreach ($roomTypeDemands['extra_demands'] as &$selDemand) {
+ if ($selDemand['id_option']) {
+ $objOption = new HotelRoomTypeGlobalDemandAdvanceOption(
+ $selDemand['id_option'],
+ $context->language->id
+ );
+ $selDemand['name'] = $objOption->name;
+ } else {
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand(
+ $selDemand['id_global_demand'],
+ $context->language->id
+ );
+ $selDemand['name'] = $objGlobalDemand->name;
+ }
+ }
+ }
+ $roomTypeDemands = $roomTypeDemands['extra_demands'];
+ }
+ }
+ } else {
+ if ($roomTypeDemands = Db::getInstance()->executeS($sql)) {
+ $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
+ foreach ($roomTypeDemands as $key => &$demand) {
+ if ($getTotalPrice) {
+ if ($demand['extra_demands']
+ && ($extraDemand = Tools::jsonDecode($demand['extra_demands'], true))
+ ) {
+ $totalDemandsPrice += $objRoomDemandPrice->getRoomTypeDemandsTotalPrice(
+ $demand['id_product'],
+ $extraDemand,
+ $useTax,
+ $demand['date_from'],
+ $demand['date_to']
+ );
+ }
+ } else {
+ $demand['extra_demands'] = Tools::jsonDecode(
+ $demand['extra_demands'],
+ true
+ );
+ if (isset($demand['extra_demands']) && $demand['extra_demands']) {
+ foreach ($demand['extra_demands'] as &$selDemand) {
+ if ($selDemand['id_option']) {
+ $objOption = new HotelRoomTypeGlobalDemandAdvanceOption(
+ $selDemand['id_option'],
+ $context->language->id
+ );
+ $selDemand['name'] = $objOption->name;
+ } else {
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand(
+ $selDemand['id_global_demand'],
+ $context->language->id
+ );
+ $selDemand['name'] = $objGlobalDemand->name;
+
+ }
+ }
+ }
+ }
}
}
}
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 9e71a7f29..d0e3679a5 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -392,7 +392,7 @@ public function saveDummyHotelBranchInfo()
$obj_hotel_info->phone = '0987654321';
$obj_hotel_info->email = 'hotelprime@htl.com';
$obj_hotel_info->check_in = '12:00';
- $obj_hotel_info->check_out = '12:00';
+ $obj_hotel_info->check_out = '11:00';
// lang fields
$languages = Language::getLanguages(false);
@@ -415,7 +415,13 @@ public function saveDummyHotelBranchInfo()
}
$obj_hotel_info->state_id = $state_id;
$obj_hotel_info->country_id = $def_cont_id;
- $obj_hotel_info->zipcode = self::getRandomZipcodeByForCountry($def_cont_id);
+ if (!$zipCode = self::getRandomZipcodeByForCountry($def_cont_id)) {
+ $objCountry = new Country($def_cont_id);
+ if (strtoupper($objCountry->iso_code) == 'GB') {
+ $zipCode = 'AA1A 1AA';
+ }
+ }
+ $obj_hotel_info->zipcode = $zipCode;
$obj_hotel_info->address = 'Monticello Dr, Montgomery, AL 36117, USA';
$obj_hotel_info->save();
@@ -583,9 +589,25 @@ public function saveDummyProductsAndRelatedInfo($id_hotel)
foreach ($ftr_arr as $key_htl_ftr => $val_htl_ftr) {
$product->addFeaturesToDB($val_htl_ftr, $ftr_val_arr[$key_htl_ftr]);
}
+
+ // save advance payment information
+ $this->saveAdvancedPaymentInfo($product_id);
}
}
+ public function saveAdvancedPaymentInfo($id_product)
+ {
+ $obj_adv_pmt = new HotelAdvancedPayment();
+ $obj_adv_pmt->active = 0;
+ $obj_adv_pmt->id_product = $id_product;
+ $obj_adv_pmt->payment_type = '';
+ $obj_adv_pmt->value = '';
+ $obj_adv_pmt->id_currency = '';
+ $obj_adv_pmt->tax_include = '';
+ $obj_adv_pmt->calculate_from = 0;
+ return $obj_adv_pmt->save();
+ }
+
public function saveDummyHotelImages($idHotel)
{
if ($idHotel) {
@@ -801,5 +823,4 @@ public static function getRandomZipcodeByForCountry($idCountry)
}
return $randZipCode;
}
-
}
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
index 07abeb5ad..66f32023c 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemand.php
@@ -20,11 +20,13 @@
class HotelRoomTypeDemand extends ObjectModel
{
- public $id_product;
- public $id_global_demand;
+ public $idProduct;
+ public $idGlobalDemand;
public $date_add;
public $date_upd;
+ protected static $_prices = array();
+
public static $definition = array(
'table' => 'htl_room_type_demand',
'primary' => 'id_room_type_demand',
@@ -36,7 +38,7 @@ class HotelRoomTypeDemand extends ObjectModel
)
);
- public function getRoomTypeDemands($idProduct, $idLang = 0)
+ public function getRoomTypeDemands($idProduct, $idLang = 0, $useTax = null)
{
if (!$idLang) {
$idLang = Context::getContext()->language->id;
@@ -60,31 +62,27 @@ public function getRoomTypeDemands($idProduct, $idLang = 0)
} else {
$idCurrency = (int)Configuration::get('PS_CURRENCY_DEFAULT');
}
+ if ($useTax === null) {
+ $useTax = HotelBookingDetail::useTax();
+ }
foreach ($roomTypeDemands as &$demand) {
$idGlobalDemand = $demand['id_global_demand'];
$roomTypeDemandInfo[$idGlobalDemand]['name'] = $demand['name'];
- $priceByRoom = $objRoomDemandPrice->getRoomTypeDemandPrice($idProduct, $idGlobalDemand);
- if (Validate::isPrice($priceByRoom)) {
- $roomTypeDemandInfo[$idGlobalDemand]['price'] = $priceByRoom;
- } else {
- $roomTypeDemandInfo[$idGlobalDemand]['price'] = $demand['price'];
- }
- $roomTypeDemandInfo[$idGlobalDemand]['price'] = Tools::convertPrice(
- $roomTypeDemandInfo[$idGlobalDemand]['price'],
- $idCurrency
+
+ $roomTypeDemandInfo[$idGlobalDemand]['price'] = HotelRoomTypeDemand::getPriceStatic(
+ $idProduct,
+ $idGlobalDemand,
+ 0,
+ $useTax
);
if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand, $idLang)) {
foreach ($advOptions as &$option) {
$idOption = $option['id'];
- $priceByRoom = $objRoomDemandPrice->getRoomTypeDemandPrice($idProduct, $idGlobalDemand, $idOption);
- if (Validate::isPrice($priceByRoom)) {
- $roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['price'] = $priceByRoom;
- } else {
- $roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['price'] = $option['price'];
- }
- $roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['price'] = Tools::convertPrice(
- $roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['price'],
- $idCurrency
+ $roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['price'] = HotelRoomTypeDemand::getPriceStatic(
+ $idProduct,
+ $idGlobalDemand,
+ $idOption,
+ $useTax
);
$roomTypeDemandInfo[$idGlobalDemand]['adv_option'][$idOption]['name'] = $option['name'];
}
@@ -95,6 +93,181 @@ public function getRoomTypeDemands($idProduct, $idLang = 0)
return false;
}
+ public static function getPriceStatic(
+ $idProduct,
+ $idGlobalDemand,
+ $idOption = 0,
+ $useTax = true,
+ $decimals = 6,
+ $idCustomer = null,
+ $idCart = null,
+ $id_address = null,
+ Context $context = null
+ ) {
+ if (!$context) {
+ $context = Context::getContext();
+ }
+
+ $curCart = $context->cart;
+
+ if (!Validate::isBool($useTax) || !Validate::isUnsignedId($idProduct)) {
+ die(Tools::displayError());
+ }
+
+ // If there is cart in context or if the specified id_cart is different from the context cart id
+ if (!is_object($curCart) || (Validate::isUnsignedInt($idCart) && $idCart && $curCart->id != $idCart)) {
+ if (!$idCart && !isset($context->employee)) {
+ die(Tools::displayError());
+ }
+ $curCart = new Cart($idCart);
+ // Store cart in context to avoid multiple instantiations in BO
+ if (!Validate::isLoadedObject($context->cart)) {
+ $context->cart = $curCart;
+ }
+ }
+
+ $idCurrency = Validate::isLoadedObject($context->currency) ? (int)$context->currency->id : (int)Configuration::get('PS_CURRENCY_DEFAULT');
+
+ // retrieve address informations
+ $idCountry = (int)$context->country->id;
+ $idState = 0;
+ $zipcode = 0;
+
+ if (!$id_address && Validate::isLoadedObject($curCart)) {
+ $id_address = $curCart->{Configuration::get('PS_TAX_ADDRESS_TYPE')};
+ }
+
+ if ($id_address) {
+ $addressInfos = Address::getCountryAndState($id_address);
+ if ($addressInfos['id_country']) {
+ $idCountry = (int)$addressInfos['id_country'];
+ $idState = (int)$addressInfos['id_state'];
+ $zipcode = $addressInfos['postcode'];
+ }
+ } elseif (isset($context->customer->geoloc_id_country)) {
+ $idCountry = (int)$context->customer->geoloc_id_country;
+ $idState = (int)$context->customer->id_state;
+ $zipcode = $context->customer->postcode;
+ }
+
+ if (Tax::excludeTaxeOption()) {
+ $useTax = false;
+ }
+
+ if ($useTax != false
+ && !empty($addressInfos['vat_number'])
+ && $addressInfos['id_country'] != Configuration::get('VATNUMBER_COUNTRY')
+ && Configuration::get('VATNUMBER_MANAGEMENT')) {
+ $useTax = false;
+ }
+
+ if (is_null($idCustomer) && Validate::isLoadedObject($context->customer)) {
+ $idCustomer = $context->customer->id;
+ }
+
+ return static::priceCalculation(
+ $context->shop->id,
+ $idProduct,
+ $idGlobalDemand,
+ $idOption,
+ $idCountry,
+ $idState,
+ $zipcode,
+ $idCurrency,
+ $useTax,
+ $decimals,
+ $idCustomer,
+ $idCart
+ );
+ }
+
+ public static function priceCalculation(
+ $idShop,
+ $idProduct,
+ $idGlobalDemand,
+ $idOption,
+ $idCountry,
+ $idState,
+ $zipcode,
+ $idCurrency,
+ $useTax,
+ $decimals,
+ $idCustomer = 0,
+ $idCart = 0
+ ) {
+ static $address = null;
+ static $context = null;
+
+ if ($address === null) {
+ $address = new Address();
+ }
+
+ if ($context == null) {
+ $context = Context::getContext()->cloneContext();
+ }
+
+ if ($idShop !== null && $context->shop->id != (int)$idShop) {
+ $context->shop = new Shop((int)$idShop);
+ }
+
+ $cacheId = (int)$idProduct.'-'.(int)$idGlobalDemand.'-'.(int)$idShop.'-'.(int)$idCurrency.'-'.
+ (int)$idCountry.'-'.$idState.'-'.$zipcode.'-'.(int)$idOption.'-'.(int)$idCustomer.'-'.(int)$idCart.'-'.
+ ($useTax?'1':'0').'-'.(int)$decimals;
+
+ if (isset(self::$_prices[$cacheId])) {
+ /* Affect reference before returning cache */
+ return self::$_prices[$cacheId];
+ }
+
+ // here get the price of global demand
+ $objRoomDmdPrice = new HotelRoomTypeDemandPrice();
+ if ($idOption) {
+ $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption);
+ $price = $objRoomDmdPrice->getRoomTypeDemandPrice(
+ $idProduct,
+ $idGlobalDemand,
+ $idOption
+ );
+ if (!Validate::isPrice($price)) {
+ $price = $objOption->price;
+ }
+ } else {
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand);
+ $price = $objRoomDmdPrice->getRoomTypeDemandPrice(
+ $idProduct,
+ $idGlobalDemand
+ );
+ if (!Validate::isPrice($price)) {
+ $price = $objGlobalDemand->price;
+ }
+ }
+ $price = Tools::convertPrice($price, $idCurrency);
+ // Tax calculation section
+ $address->id_country = $idCountry;
+ $address->id_state = $idState;
+ $address->postcode = $zipcode;
+
+ $tax_manager = TaxManagerFactory::getManager(
+ $address,
+ HotelRoomTypeGlobalDemand::getIdTaxRulesGroupByIdGlobalDemanu((int)$idGlobalDemand)
+ );
+ $product_tax_calculator = $tax_manager->getTaxCalculator();
+
+ // Add Tax
+ if ($useTax) {
+ $price = $product_tax_calculator->addTaxes($price);
+ }
+
+ $price = Tools::ps_round($price, $decimals);
+
+ if ($price < 0) {
+ $price = 0;
+ }
+
+ self::$_prices[$cacheId] = $price;
+ return self::$_prices[$cacheId];
+ }
+
public function deleteRoomTypeDemands($idProduct = 0, $idGlobalDemand = 0)
{
$where = '1';
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
index 73e8aed26..a70e11b46 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeDemandPrice.php
@@ -50,7 +50,7 @@ public function getRoomTypeDemandPrice($idProduct, $idGlobalDemand, $idOption =
);
}
- public function getRoomTypeDemandsTotalPrice($idProduct, $roomDemands)
+ public function getRoomTypeDemandsTotalPrice($idProduct, $roomDemands, $useTax = null, $dateFrom = 0, $dateTo = 0)
{
$totalDemandsPrice = 0;
if ($roomDemands) {
@@ -62,40 +62,42 @@ public function getRoomTypeDemandsTotalPrice($idProduct, $roomDemands)
} else {
$idCurrency = (int)Configuration::get('PS_CURRENCY_DEFAULT');
}
+ $objRoomDmdPrice = new HotelRoomTypeDemandPrice();
+ if ($useTax === null) {
+ $useTax = HotelBookingDetail::useTax();
+ }
+ $objBookingDetail = new HotelBookingDetail();
foreach ($roomDemands as $demand) {
$idGlobalDemand = $demand['id_global_demand'];
$idOption = $demand['id_option'];
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand);
if ($idOption) {
$objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption);
- $priceByRoom = $this->getRoomTypeDemandPrice(
+ $price = HotelRoomTypeDemand::getPriceStatic(
$idProduct,
$idGlobalDemand,
- $idOption
+ $idOption,
+ $useTax
);
- if (Validate::isPrice($priceByRoom)) {
- $totalDemandsPrice += $priceByRoom;
- } else {
- $totalDemandsPrice += $objOption->price;
- }
} else {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand);
- $priceByRoom = $this->getRoomTypeDemandPrice(
+ $price = HotelRoomTypeDemand::getPriceStatic(
$idProduct,
$idGlobalDemand,
- $idOption
+ 0,
+ $useTax
);
- if (Validate::isPrice($priceByRoom)) {
- $totalDemandsPrice += $priceByRoom;
- } else {
- $totalDemandsPrice += $objGlobalDemand->price;
+ }
+ if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
+ if ($dateFrom && $dateTo) {
+ $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo);
+ if ($numDays > 1) {
+ $price *= $numDays;
+ }
}
}
+ $totalDemandsPrice += $price;
}
}
- $totalDemandsPrice = Tools::convertPrice(
- $totalDemandsPrice,
- $idCurrency
- );
return $totalDemandsPrice;
}
@@ -116,5 +118,45 @@ public function deleteRoomTypeDemandPrices($idProduct = 0, $idGlobalDemand = 0,
$where
);
}
+
+ public function delete()
+ {
+ // delete advance options of the global demands
+ $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
+ if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($this->id)) {
+ foreach ($advOptions as $option) {
+ $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($option['id']);
+ $objAdvOption->delete();
+ }
+ }
+ // delete the global demands from cart
+ $objCartBookingData = new HotelCartBookingData();
+ if ($cartExtraDemands = $objCartBookingData->getCartExtraDemands()) {
+ foreach ($cartExtraDemands as &$demandInfo) {
+ if (isset($demandInfo['extra_demands']) && $demandInfo['extra_demands']) {
+ $cartChanged = 0;
+ foreach ($demandInfo['extra_demands'] as $key => $demand) {
+ if ($this->id == $demand['id_global_demand']) {
+ $cartChanged = 1;
+ unset($demandInfo['extra_demands'][$key]);
+ }
+ }
+ if ($cartChanged) {
+ if (Validate::isLoadedObject($objCartBooking = new HotelCartBookingData($demandInfo['id']))) {
+ $objCartBooking->extra_demands = Tools::jsonEncode($demandInfo['extra_demands']);
+ $objCartBooking->save();
+ }
+ }
+ }
+ }
+ }
+
+ // delete the info from room type demands table
+ $objRoomTypeDemand = new HotelRoomTypeDemand();
+ $objRoomTypeDemand->deleteRoomTypeDemands(0, $this->id);
+ $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
+ $objRoomTypeDemandPrice->deleteRoomTypeDemandPrices(0, $this->id);
+ return parent::delete();
+ }
}
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemand.php b/modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemand.php
index ac604a51e..525341ccb 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemand.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeGlobalDemand.php
@@ -22,6 +22,8 @@ class HotelRoomTypeGlobalDemand extends ObjectModel
{
public $name;
public $price;
+ public $id_tax_rules_group;
+ public $price_calc_method;
public $date_add;
public $date_upd;
@@ -31,6 +33,8 @@ class HotelRoomTypeGlobalDemand extends ObjectModel
'multilang' => true,
'fields' => array(
'price' => array('type' => self::TYPE_FLOAT),
+ 'id_tax_rules_group' => array('type' => self::TYPE_INT),
+ 'price_calc_method' => array('type' => self::TYPE_INT),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
//lang fields
@@ -43,6 +47,9 @@ class HotelRoomTypeGlobalDemand extends ObjectModel
),
));
+ const WK_PRICE_CALC_METHOD_EACH_DAY = 1;
+ const WK_PRICE_CALC_METHOD_RANGE = 0;
+
public function __construct($id = null, $id_lang = null, $id_shop = null)
{
parent::__construct($id, $id_lang, $id_shop);
@@ -107,4 +114,13 @@ public function getAllDemands($idLang = null)
}
return $demands;
}
+
+ public static function getIdTaxRulesGroupByIdGlobalDemanu($idGlobalDemand)
+ {
+ $context = Context::getContext();
+ return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(
+ 'SELECT `id_tax_rules_group` FROM `'._DB_PREFIX_.'htl_room_type_global_demand`
+ WHERE `id_global_demand` = '.(int)$idGlobalDemand
+ );
+ }
}
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
index 17a4cac6a..b0245d9a4 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -26,6 +26,14 @@ public function __construct()
$this->table = 'htl_branch_info';
$this->className = 'HotelBranchInformation';
$this->identifier = 'id';
+ $this->context = Context::getContext();
+
+ // START send access query information to the admin controller
+ $this->access_select = ' SELECT a.`id` FROM '._DB_PREFIX_.'htl_branch_info a';
+ if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
+ $this->access_where = ' WHERE a.id IN ('.implode(',', $acsHtls).')';
+ }
+
parent::__construct();
$this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl
@@ -107,7 +115,7 @@ public function renderForm()
$smartyVars['languages'] = Language::getLanguages(false);
$smartyVars['currentLang'] = Language::getLanguage((int) $currentLangId);
- $countries = Country::getCountries($this->context->language->id);
+ $countries = Country::getCountries($this->context->language->id, true);
$smartyVars['country_var'] = $countries;
$country = $this->context->country;
@@ -127,7 +135,6 @@ public function renderForm()
}
}
$smartyVars['edit'] = 1;
- $smartyVars['country_var'] = $countries;
$smartyVars['state_var'] = $states;
$smartyVars['hotel_info'] = $hotelBranchInfo;
//Hotel Images
@@ -439,23 +446,16 @@ public function processSave()
public function ajaxProcessStateByCountryId()
{
- $idCountry = Tools::getValue('id_country');
$states = array();
- $statesbycountry = State::getStatesByIdCountry($idCountry);
- if ($statesbycountry) {
- $states = array();
- foreach ($statesbycountry as $key => $value) {
- $states[$key]['id'] = $value['id_state'];
- $states[$key]['name'] = $value['name'];
- }
- if (isset($states)) {
- die(Tools::jsonEncode($states));
- } else {
- die(Tools::jsonEncode($states));
+ if ($idCountry = Tools::getValue('id_country')) {
+ if ($statesbycountry = State::getStatesByIdCountry($idCountry)) {
+ foreach ($statesbycountry as $key => $value) {
+ $states[$key]['id'] = $value['id_state'];
+ $states[$key]['name'] = $value['name'];
+ }
}
- } else {
- die(Tools::jsonEncode($states));
}
+ die(Tools::jsonEncode($states));
}
public function ajaxProcessUploadHotelImages()
@@ -517,30 +517,28 @@ public function ajaxProcessChangeCoverImage()
public function ajaxProcessDeleteHotelImage()
{
- $idImage = Tools::getValue('id_image');
- if ($idImage) {
- $idHotel = Tools::getValue('id_hotel');
- $objHtlImage = new HotelImage((int) $idImage);
- if ($objHtlImage->delete()) {
- if (!HotelImage::getCover($idHotel)) {
- $images = $objHtlImage->getAllImagesByHotelId($idHotel);
- if ($images) {
- $objHtlImage = new HotelImage($images[0]['id']);
- $objHtlImage->cover = 1;
- $objHtlImage->save();
+ if ($idImage = Tools::getValue('id_image')) {
+ if ($idHotel = Tools::getValue('id_hotel')) {
+ if (Validate::isLoadedObject($objHtlImage = new HotelImage((int) $idImage))) {
+ $imgCode = $objHtlImage->hotel_image_id;
+ if ($objHtlImage->delete()) {
+ if (!HotelImage::getCover($idHotel)) {
+ $images = $objHtlImage->getAllImagesByHotelId($idHotel);
+ if ($images) {
+ $objHtlImage = new HotelImage($images[0]['id']);
+ $objHtlImage->cover = 1;
+ $objHtlImage->save();
+ }
+ }
+ if (file_exists(_PS_MODULE_DIR_.$this->module->name.'/views/img/hotel_img/'.$imgCode.'.jpg')) {
+ @unlink(_PS_MODULE_DIR_.$this->module->name.'/views/img/hotel_img/'.$imgCode.'.jpg');
+ }
+ die(true);
}
}
-
- if (file_exists(_PS_MODULE_DIR_.$this->module->name.'/views/img/hotel_img/'.$idImage.'.jpg')) {
- @unlink(_PS_MODULE_DIR_.$this->module->name.'/views/img/hotel_img/'.$idImage.'.jpg');
- }
- die(true);
- } else {
- die(false);
}
- } else {
- die(false);
}
+ die(false);
}
public function setMedia()
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php b/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php
index afa35a521..410d185ae 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php
@@ -25,8 +25,16 @@ public function __construct()
$this->bootstrap = true;
$this->table = 'htl_branch_features';
$this->className = 'HotelBranchFeatures';
-
$this->identifier = 'id';
+ $this->context = Context::getContext();
+
+ // START send access query information to the admin controller
+ $this->access_select = ' SELECT a.`id` FROM '._DB_PREFIX_.'htl_branch_features a';
+ $this->access_join = ' INNER JOIN '._DB_PREFIX_.'htl_branch_info hbi ON (hbi.id = a.id_hotel)';
+ if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
+ $this->access_where = ' WHERE hbi.id IN ('.implode(',', $acsHtls).')';
+ }
+
parent::__construct();
$this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'htl_branch_info` hi ON (hi.`id` = a.`id_hotel`)';
@@ -117,6 +125,13 @@ public function renderForm()
$featuresList = $objHotelFeatures->HotelAllCommonFeaturesArray();
$objBranchInfo = new HotelBranchInformation();
$unassignedFtrsHotels = $objBranchInfo->getUnassignedFeaturesHotelIds();
+ // filter hotels as per accessed hotels
+ $unassignedFtrsHotels = HotelBranchInformation::filterDataByHotelAccess(
+ $unassignedFtrsHotels,
+ $this->context->employee->id_profile,
+ 1
+ );
+
$smartyVars['hotels'] = $unassignedFtrsHotels;
$smartyVars['features_list'] = $featuresList;
} elseif ($this->display == 'edit') {
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
index f6f6ac1d4..9f0520869 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php
@@ -26,6 +26,15 @@ public function __construct()
$this->className = 'HotelRoomTypeFeaturePricing';
$this->bootstrap = true;
$this->identifier = 'id_feature_price';
+ $this->context = Context::getContext();
+
+ // START send access query information to the admin controller
+ $this->access_select = ' SELECT a.`id_feature_price` FROM '._DB_PREFIX_.'htl_room_type_feature_pricing a';
+ $this->access_join = ' INNER JOIN '._DB_PREFIX_.'htl_room_type hrt ON (hrt.id_product = a.id_product)';
+ if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
+ $this->access_where = ' WHERE hrt.id_hotel IN ('.implode(',', $acsHtls).')';
+ }
+
parent::__construct();
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = a.`id_product` AND pl.`id_lang`='.(int) $this->context->language->id.')';
@@ -399,6 +408,11 @@ public function ajaxProcessSearchProductByName()
$productName = Tools::getValue('room_type_name');
if ($productName) {
$productsByName = Product::searchByName($this->context->language->id, $productName);
+ // filter room types as per accessed hotels
+ $productsByName = HotelBranchInformation::filterDataByHotelAccess(
+ $productsByName,
+ $this->context->employee->id_profile
+ );
if ($productsByName) {
foreach ($productsByName as &$product) {
$hotelRoomType = new HotelRoomType();
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index 2a79bba0a..b706854b6 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -154,13 +154,22 @@ public function renderView()
$date_to = Tools::getValue('dt_t');
} else {
$date_to = date('Y-m-t');
+ if (strtotime($date_from) == strtotime($date_to)) {
+ $date_to = date('Y-m-d', strtotime('+1 day', strtotime($date_to)));
+ }
}
if (Tools::getValue('id_htl')) {
$hotel_id = Tools::getValue('id_htl');
} else {
$obj_htl_info = new HotelBranchInformation();
if ($htl_info = $obj_htl_info->hotelBranchesInfo(false, 1)) {
- $hotel_id = $htl_info[0]['id'];
+ // filter hotels as per accessed hotels
+ $htl_info = HotelBranchInformation::filterDataByHotelAccess(
+ $htl_info,
+ $this->context->employee->id_profile,
+ 1
+ );
+ $hotel_id = reset($htl_info)['id'];
}
}
if (Tools::getValue('id_rt')) {
@@ -193,13 +202,6 @@ public function renderView()
$booking_calendar_data = array();
if (!count($this->errors)) {
- if (!$hotel_id) {
- $this->errors[] = $this->l('Please select a hotel.');
- $obj_htl_info = new HotelBranchInformation();
- if ($htl_info = $obj_htl_info->hotelBranchesInfo(false, 1)) {
- $hotel_id = $htl_info[0]['id'];
- }
- }
$booking_data = $this->getAllBookingDataInfo(
$date_from,
$date_to,
@@ -252,6 +254,12 @@ public function renderView()
}
}
$hotel_name = $obj_htl_info->hotelBranchesInfo(false, 1);
+ // filter hotels as per accessed hotels
+ $hotel_name = HotelBranchInformation::filterDataByHotelAccess(
+ $hotel_name,
+ $this->context->employee->id_profile,
+ 1
+ );
$all_room_type = $obj_rm_type->getRoomTypeByHotelId($hotel_id, Configuration::get('PS_LANG_DEFAULT'), 1);
$rms_in_cart = $obj_cart_book_data->getCountRoomsInCart($id_cart, $id_guest);
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
index d17834a13..990898f84 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -69,6 +69,14 @@ public function __construct()
);
$this->addRowAction('view');
$this->identifier = 'id';
+
+ // START send access query information to the admin controller
+ $this->access_select = ' SELECT a.`id` FROM '._DB_PREFIX_.'htl_order_refund_info a';
+ $this->access_join = ' INNER JOIN '._DB_PREFIX_.'htl_booking_detail hbd ON (hbd.id_order = a.id_order)';
+ if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
+ $this->access_where = ' WHERE hbd.id_hotel IN ('.implode(',', $acsHtls).')';
+ }
+
parent::__construct();
}
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRestrictSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRestrictSettingsController.php
index e2a4e3d6e..187a11bcd 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRestrictSettingsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRestrictSettingsController.php
@@ -8,6 +8,15 @@ public function __construct()
$this->className = 'HotelOrderRestrictDate';
$this->bootstrap = true;
$this->identifier = 'id';
+ $this->context = Context::getContext();
+
+ // START send access query information to the admin controller
+ $this->access_select = ' SELECT a.`id` FROM '._DB_PREFIX_.'htl_order_restrict_date a';
+ $this->access_join = ' INNER JOIN '._DB_PREFIX_.'htl_branch_info hbi ON (hbi.id = a.id_hotel)';
+ if ($acsHtls = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1)) {
+ $this->access_where = ' WHERE hbi.id IN ('.implode(',', $acsHtls).')';
+ }
+
parent::__construct();
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_branch_info` hb ON (a.`id_hotel` = hb.`id`)';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl
@@ -89,6 +98,12 @@ public function renderForm()
if ($this->display == 'add') {
$order_restrict_date = new HotelOrderRestrictDate();
$hotels_list = $order_restrict_date->getUnsavedHotelsForOrderRestrict();
+ // filter hotels as per accessed hotels
+ $hotels_list = HotelBranchInformation::filterDataByHotelAccess(
+ $hotels_list,
+ $this->context->employee->id_profile,
+ 1
+ );
$this->context->smarty->assign('hotels_list', $hotels_list);
} elseif ($this->display == 'edit') {
$id = Tools::getValue('id');
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php b/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php
index 8f0c4e55f..e09a2a6d1 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminRoomTypeGlobalDemand.php
@@ -32,28 +32,54 @@ public function __construct()
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_room_type_global_demand_lang` asl
ON (a.id_global_demand = asl.id_global_demand)';
- $this->_select .= ' asl.`name`';
+
+ $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option` dao
+ ON (a.id_global_demand = dao.id_global_demand)';
+
+ $this->_select .= ' a.`price` as global_price, asl.`name` as global_name,';
+
+ $this->_select .= ' IF(SUM(dao.`id_option`), 1, 0) as adv_options,';
+ $this->_select .= ' IF(SUM(dao.`id_option`), "'.$this->l('Yes').'", "'.$this->l('No').'") as has_adv_option,';
+ $this->_select .= ' IF(SUM(dao.`id_option`), 1, 0) badge_success, IF(SUM(dao.`id_option`), 0, 1) badge_danger,' ;
+
$this->_where = ' AND asl.`id_lang` = '.(int) $this->context->language->id;
+ $this->_group = ' GROUP BY a.`id_global_demand`';
+ $advOptList = array(
+ 1 => $this->l('Yes'),
+ 0 => $this->l('No'),
+ );
$this->fields_list = array(
'id_global_demand' => array(
'title' => $this->l('Id'),
'align' => 'center',
),
- 'name' => array(
+ 'global_name' => array(
'title' => $this->l('Name'),
'align' => 'center',
+ 'havingFilter' => true,
+ 'filter_key' => 'global_name',
+ ),
+ 'has_adv_option' => array(
+ 'title' => $this->l('Advance Options'),
+ 'hint' => $this->l('Yes, if this activity includes a price. No, if activity has no price'),
+ 'align' => 'center',
+ 'type' => 'bool',
+ 'type' => 'select',
+ 'list' => $advOptList,
+ 'badge_success' => true,
+ 'badge_danger' => true,
+ 'class' => 'fixed-width-xs',
+ 'havingFilter' => true,
+ 'filter_key' => 'adv_options',
),
- 'price' => array(
+ 'global_price' => array(
'title' => $this->l('Price'),
'align' => 'center',
'type' => 'price',
'currency' => true,
- ),
- 'date_add' => array(
- 'title' => $this->l('Date Add'),
- 'align' => 'center',
- 'type' => 'date',
+ 'havingFilter' => true,
+ 'filter_key' => 'global_price',
),
);
@@ -69,11 +95,13 @@ public function __construct()
public function initToolbar()
{
parent::initToolbar();
- $this->page_header_toolbar_btn['new'] = array(
- 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
- 'desc' => $this->l('Add New Facility'),
- 'imgclass' => 'new'
- );
+ if (empty($this->display)) {
+ $this->page_header_toolbar_btn['new'] = array(
+ 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
+ 'desc' => $this->l('Add New Facility'),
+ 'imgclass' => 'new'
+ );
+ }
}
public function renderList()
@@ -107,6 +135,10 @@ public function renderForm()
$smartyVars['edit'] = 1;
}
}
+ //show tax rule group
+ if ($taxRuleGroups = TaxRulesGroup::getTaxRulesGroups(true)) {
+ $smartyVars['taxRuleGroups'] = $taxRuleGroups;
+ }
Media::addJsDef(
array(
'globalDemandLink' => $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand'),
@@ -132,6 +164,8 @@ public function processSave()
{
$idDemand = Tools::getValue('id_global_demand');
$price = Tools::getValue('price');
+ $idTaxRulesGroup = Tools::getValue('id_tax_rules_group');
+ $priceCalcMethod = Tools::getValue('price_calc_method');
$activeAdvOpt = Tools::getValue('active_adv_option');
$advOptPrices = Tools::getValue('option_price');
$advOptIds = Tools::getValue('id_option');
@@ -153,12 +187,38 @@ public function processSave()
}
}
}
- if (!Validate::isPrice($price)) {
- $this->errors[] = $this->l('Please enter a valid price.');
+ if (!$activeAdvOpt) {
+ if (!Validate::isPrice($price)) {
+ $this->errors[] = $this->l('Please enter a valid price.');
+ }
+ } else {
+ $price = 0;
}
if ($activeAdvOpt && !$advOptPrices) {
$this->errors[] = $this->l('Please create at least one advance option for the service.');
}
+ // validate non advance options
+ if ($activeAdvOpt && $advOptPrices) {
+ foreach ($advOptPrices as $key => $advPrice) {
+ if (!trim(Tools::getValue('option_name_'.$defaultLangId)[$key])) {
+ $this->errors[] = $this->l('Advance option name is required at least in ').
+ $objDefaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ if (trim(Tools::getValue('option_name_'.$lang['id_lang'])[$key])) {
+ if (!Validate::isGenericName(
+ Tools::getValue('option_name_'.$lang['id_lang'])[$key]
+ )) {
+ $this->errors[] = $this->l('Invalid advance option name in ').$lang['name'];
+ }
+ }
+ }
+ }
+ if (!Validate::isPrice($advPrice)) {
+ $this->errors[] = $this->l('Please enter a valid price for advance option.');
+ }
+ }
+ }
if (!count($this->errors)) {
if ($idDemand) {
@@ -179,6 +239,8 @@ public function processSave()
}
}
$objGlobalDemand->price = $price;
+ $objGlobalDemand->id_tax_rules_group = $idTaxRulesGroup;
+ $objGlobalDemand->price_calc_method = $priceCalcMethod;
if ($objGlobalDemand->save()) {
$objOption = new HotelRoomTypeGlobalDemandAdvanceOption();
$skipIds = array();
@@ -191,49 +253,28 @@ public function processSave()
}
}
$objOption->deleteGlobalDemandAdvanceOptions($objGlobalDemand->id, $skipIds);
- if ($activeAdvOpt) {
+ if ($activeAdvOpt && $advOptPrices) {
foreach ($advOptPrices as $key => $advPrice) {
- if (!trim(Tools::getValue('option_name_'.$defaultLangId)[$key])) {
- $this->errors[] = $this->l('Advance option name is required at least in ').
- $objDefaultLanguage['name'];
+ if (isset($advOptIds[$key]) && $advOptIds[$key]) {
+ $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($advOptIds[$key]);
} else {
- foreach ($languages as $lang) {
- // validate non required fields
- if (trim(Tools::getValue('option_name_'.$lang['id_lang'])[$key])) {
- if (!Validate::isGenericName(
- Tools::getValue('option_name_'.$lang['id_lang'])[$key]
- )) {
- $this->errors[] = $this->l('Invalid advance option name in ').$lang['name'];
- }
- }
- }
+ $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
}
- if (!Validate::isPrice($advPrice)) {
- $this->errors[] = $this->l('Please enter a valid price for advance option.');
- }
-
- if (!count($this->errors)) {
- if (isset($advOptIds[$key]) && $advOptIds[$key]) {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($advOptIds[$key]);
+ $objAdvOption->id_global_demand = $objGlobalDemand->id;
+ // advance options lang fields
+ foreach ($languages as $lang) {
+ if (!trim(Tools::getValue('option_name_'.$lang['id_lang'])[$key])) {
+ $objAdvOption->name[$lang['id_lang']] = Tools::getValue(
+ 'option_name_'.$defaultLangId
+ )[$key];
} else {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- }
- $objAdvOption->id_global_demand = $objGlobalDemand->id;
- // advance options lang fields
- foreach ($languages as $lang) {
- if (!trim(Tools::getValue('option_name_'.$lang['id_lang'])[$key])) {
- $objAdvOption->name[$lang['id_lang']] = Tools::getValue(
- 'option_name_'.$defaultLangId
- )[$key];
- } else {
- $objAdvOption->name[$lang['id_lang']] = Tools::getValue(
- 'option_name_'.$lang['id_lang']
- )[$key];
- }
+ $objAdvOption->name[$lang['id_lang']] = Tools::getValue(
+ 'option_name_'.$lang['id_lang']
+ )[$key];
}
- $objAdvOption->price = $advPrice;
- $objAdvOption->save();
}
+ $objAdvOption->price = $advPrice;
+ $objAdvOption->save();
}
}
}
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
index 603ff6339..6fbd29018 100644
--- a/modules/hotelreservationsystem/hotelreservationsystem.php
+++ b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -29,7 +29,7 @@ class hotelreservationsystem extends Module
public function __construct()
{
$this->name = 'hotelreservationsystem';
- $this->version = '1.3.0';
+ $this->version = '1.4.0';
$this->author = 'Webkul';
$this->need_instance = 0;
$this->bootstrap = true;
@@ -159,6 +159,30 @@ public function hookActionObjectProductDeleteBefore($params)
}
}
+ // Add profile hotel access while profile is added
+ public function hookActionObjectProfileAddAfter($params)
+ {
+ if (isset($params['object']->id)) {
+ $idProfile = $params['object']->id;
+ $objHotelBranch = new HotelBranchInformation();
+ if (!$objHotelBranch->addHotelsAccessToProfile($idProfile)) {
+ $this->context->controller->errors[] = $this->l('Some error occurred while adding hotel accesses to this profile');
+ }
+ }
+ }
+
+ // Delete profile hotel access while profile is deleted
+ public function hookActionObjectProfileDeleteBefore($params)
+ {
+ if (isset($params['object']->id)) {
+ $idProfile = $params['object']->id;
+ $objHotelBranch = new HotelBranchInformation();
+ if (!$objHotelBranch->deleteProfileHotelsAccess($idProfile)) {
+ $this->context->controller->errors[] = $this->l('Some error occurred while deleting hotel accesses of the profile');
+ }
+ }
+ }
+
public function hookDisplayAdminProductsExtra($params)
{
if ($idProduct = Tools::getValue('id_product')) {
@@ -319,53 +343,54 @@ public function hookActionValidateOrder($data)
$order = $data['order'];
$customer = $data['customer'];
- $obj_cart_bk_data = new HotelCartBookingData();
- $obj_htl_bk_dtl = new HotelBookingDetail();
+ $objCartBkData = new HotelCartBookingData();
+ $objHtlBkDtl = new HotelBookingDetail();
$obj_rm_type = new HotelRoomType();
$obj_adv_payment = new HotelAdvancedPayment();
$orderProducts = $order->getProducts();
+ $vatAddress = new Address((int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')});
foreach ($orderProducts as $product) {
- $obj_cart_bk_data = new HotelCartBookingData();
+ $objCartBkData = new HotelCartBookingData();
$idProduct = $product['id_product'];
- $cart_bk_data = $obj_cart_bk_data->getOnlyCartBookingData($cart->id, $cart->id_guest, $idProduct);
+ $cart_bk_data = $objCartBkData->getOnlyCartBookingData($cart->id, $cart->id_guest, $idProduct);
if ($cart_bk_data) {
foreach ($cart_bk_data as $cb_k => $cb_v) {
- $obj_cart_bk_data = new HotelCartBookingData($cb_v['id']);
- $obj_cart_bk_data->id_order = $order->id;
- $obj_cart_bk_data->id_customer = $customer->id;
- $obj_cart_bk_data->save();
-
- $obj_htl_bk_dtl = new HotelBookingDetail();
- $id_order_detail = $obj_htl_bk_dtl->getPsOrderDetailIdByIdProduct($idProduct, $order->id);
- $obj_htl_bk_dtl->id_product = $idProduct;
- $obj_htl_bk_dtl->id_order = $order->id;
- $obj_htl_bk_dtl->id_order_detail = $id_order_detail;
- $obj_htl_bk_dtl->id_cart = $cart->id;
- $obj_htl_bk_dtl->id_room = $obj_cart_bk_data->id_room;
- $obj_htl_bk_dtl->id_hotel = $obj_cart_bk_data->id_hotel;
- $obj_htl_bk_dtl->id_customer = $customer->id;
- $obj_htl_bk_dtl->booking_type = $obj_cart_bk_data->booking_type;
- $obj_htl_bk_dtl->id_status = 1;
- $obj_htl_bk_dtl->comment = $obj_cart_bk_data->comment;
+ $objCartBkData = new HotelCartBookingData($cb_v['id']);
+ $objCartBkData->id_order = $order->id;
+ $objCartBkData->id_customer = $customer->id;
+ $objCartBkData->save();
+
+ $objHtlBkDtl = new HotelBookingDetail();
+ $id_order_detail = $objHtlBkDtl->getPsOrderDetailIdByIdProduct($idProduct, $order->id);
+ $objHtlBkDtl->id_product = $idProduct;
+ $objHtlBkDtl->id_order = $order->id;
+ $objHtlBkDtl->id_order_detail = $id_order_detail;
+ $objHtlBkDtl->id_cart = $cart->id;
+ $objHtlBkDtl->id_room = $objCartBkData->id_room;
+ $objHtlBkDtl->id_hotel = $objCartBkData->id_hotel;
+ $objHtlBkDtl->id_customer = $customer->id;
+ $objHtlBkDtl->booking_type = $objCartBkData->booking_type;
+ $objHtlBkDtl->id_status = 1;
+ $objHtlBkDtl->comment = $objCartBkData->comment;
// For Back Order(Because of cart lock)
- if ($obj_cart_bk_data->is_back_order) {
- $obj_htl_bk_dtl->is_back_order = 1;
+ if ($objCartBkData->is_back_order) {
+ $objHtlBkDtl->is_back_order = 1;
}
$total_price = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$idProduct,
- $obj_cart_bk_data->date_from,
- $obj_cart_bk_data->date_to
+ $objCartBkData->date_from,
+ $objCartBkData->date_to
);
- $obj_htl_bk_dtl->date_from = $obj_cart_bk_data->date_from;
- $obj_htl_bk_dtl->date_to = $obj_cart_bk_data->date_to;
- $obj_htl_bk_dtl->total_price_tax_excl = Tools::ps_round($total_price['total_price_tax_excl'], 5);
- $obj_htl_bk_dtl->total_price_tax_incl = Tools::ps_round($total_price['total_price_tax_incl'], 5);
- if ($obj_htl_bk_dtl->save()) {
+ $objHtlBkDtl->date_from = $objCartBkData->date_from;
+ $objHtlBkDtl->date_to = $objCartBkData->date_to;
+ $objHtlBkDtl->total_price_tax_excl = Tools::ps_round($total_price['total_price_tax_excl'], 5);
+ $objHtlBkDtl->total_price_tax_incl = Tools::ps_round($total_price['total_price_tax_incl'], 5);
+ if ($objHtlBkDtl->save()) {
// save extra demands info
- if ($obj_cart_bk_data->extra_demands
- && ($extraDemands = Tools::jsonDecode($obj_cart_bk_data->extra_demands, true))
+ if ($objCartBkData->extra_demands
+ && ($extraDemands = Tools::jsonDecode($objCartBkData->extra_demands, true))
) {
$idLang = (int)$cart->id_lang;
$objRoomDemandPrice = new HotelRoomTypeDemandPrice();
@@ -373,43 +398,57 @@ public function hookActionValidateOrder($data)
$idGlobalDemand = $demand['id_global_demand'];
$idOption = $demand['id_option'];
$objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $obj_htl_bk_dtl->id;
+ $objBookingDemand->id_htl_booking = $objHtlBkDtl->id;
+ $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
if ($idOption) {
$objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
$objBookingDemand->name = $objOption->name;
- $priceByRoom = $objRoomDemandPrice->getRoomTypeDemandPrice(
- $idProduct,
- $idGlobalDemand,
- $idOption
- );
- if (Validate::isPrice($priceByRoom)) {
- $objBookingDemand->price = $priceByRoom;
- } else {
- $objBookingDemand->price = $objOption->price;
- }
} else {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
+ $idOption = 0;
$objBookingDemand->name = $objGlobalDemand->name;
- $priceByRoom = $objRoomDemandPrice->getRoomTypeDemandPrice(
- $idProduct,
- $idGlobalDemand,
- $idOption
+ }
+ $objBookingDemand->unit_price_tax_excl = HotelRoomTypeDemand::getPriceStatic(
+ $idProduct,
+ $idGlobalDemand,
+ $idOption,
+ 0
+ );
+ $objBookingDemand->unit_price_tax_incl = HotelRoomTypeDemand::getPriceStatic(
+ $idProduct,
+ $idGlobalDemand,
+ $idOption,
+ 1
+ );
+ $qty = 1;
+ if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
+ $numDays = $objHtlBkDtl->getNumberOfDays(
+ $objHtlBkDtl->date_from,
+ $objHtlBkDtl->date_to
);
- if (Validate::isPrice($priceByRoom)) {
- $objBookingDemand->price = $priceByRoom;
- } else {
- $objBookingDemand->price = $objGlobalDemand->price;
+ if ($numDays > 1) {
+ $qty *= $numDays;
}
}
- $objBookingDemand->price = Tools::convertPrice(
- $objBookingDemand->price,
- (int)$order->id_currency
+ $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $qty;
+ $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $qty;
+
+ $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method;
+ $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group;
+ $taxManager = TaxManagerFactory::getManager(
+ $vatAddress,
+ $objGlobalDemand->id_tax_rules_group
);
- $objBookingDemand->save();
+ $taxCalc = $taxManager->getTaxCalculator();
+ $objBookingDemand->tax_computation_method = (int)$taxCalc->computation_method;
+ if ($objBookingDemand->save()) {
+ $objBookingDemand->tax_calculator = $taxCalc;
+ $objBookingDemand->id_global_demand = $idGlobalDemand;
+ // Now save tax details of the extra demand
+ $objBookingDemand->setBookingDemandTaxDetails();
+ }
}
}
}
-
/*for saving details of the advance payment product wise*/
if (Configuration::get('WK_ALLOW_ADVANCED_PAYMENT')) {
$obj_customer_adv = new HotelCustomerAdvancedPayment();
@@ -422,14 +461,14 @@ public function hookActionValidateOrder($data)
) {
$room_adv_amount = $obj_adv_payment->getRoomMinAdvPaymentAmount(
$idProduct,
- $obj_cart_bk_data->date_from,
- $obj_cart_bk_data->date_to
+ $objCartBkData->date_from,
+ $objCartBkData->date_to
);
$obj_customer_adv_product = new HotelCustomerAdvancedProductPayment();
$obj_customer_adv_product->id_cart = $cart->id;
- $obj_customer_adv_product->id_room = $obj_cart_bk_data->id_room;
- $obj_customer_adv_product->id_hotel = $obj_cart_bk_data->id_hotel;
- $obj_customer_adv_product->id_hotel = $obj_cart_bk_data->quantity;
+ $obj_customer_adv_product->id_room = $objCartBkData->id_room;
+ $obj_customer_adv_product->id_hotel = $objCartBkData->id_hotel;
+ $obj_customer_adv_product->id_hotel = $objCartBkData->quantity;
$obj_customer_adv_product->id_product = $idProduct;
$obj_customer_adv_product->id_order = $order->id;
$obj_customer_adv_product->id_guest = $cart->id_guest;
@@ -444,8 +483,8 @@ public function hookActionValidateOrder($data)
false
);
$obj_customer_adv_product->advance_payment_amount = $room_adv_amount;
- $obj_customer_adv_product->date_from = $obj_cart_bk_data->date_from;
- $obj_customer_adv_product->date_to = $obj_cart_bk_data->date_to;
+ $obj_customer_adv_product->date_from = $objCartBkData->date_from;
+ $obj_customer_adv_product->date_to = $objCartBkData->date_to;
$obj_customer_adv_product->save();
}
}
@@ -653,7 +692,9 @@ public function registerModuleHooks()
'actionObjectLanguageAddAfter',
'actionAdminControllerSetMedia',
'displayAdminProductsExtra',
- 'actionProductUpdate'
+ 'actionProductUpdate',
+ 'actionObjectProfileAddAfter',
+ 'actionObjectProfileDeleteBefore',
)
);
}
@@ -684,6 +725,7 @@ public function deleteTables()
`'._DB_PREFIX_.'htl_room_type_feature_pricing`,
`'._DB_PREFIX_.'htl_room_type_feature_pricing_lang`,
`'._DB_PREFIX_.'htl_room_disable_dates`,
+ `'._DB_PREFIX_.'htl_access`,
`'._DB_PREFIX_.'htl_order_refund_stages`'
);
}
diff --git a/modules/hotelreservationsystem/install.sql b/modules/hotelreservationsystem/install.sql
index 5854c9106..9d62b818b 100644
--- a/modules/hotelreservationsystem/install.sql
+++ b/modules/hotelreservationsystem/install.sql
@@ -160,12 +160,26 @@ CREATE TABLE IF NOT EXISTS `PREFIX_htl_booking_demands` (
`id_booking_demand` int(11) NOT NULL AUTO_INCREMENT,
`id_htl_booking` int(11) NOT NULL,
`name` varchar(255) character set utf8 NOT NULL,
- `price` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `unit_price_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `unit_price_tax_incl` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `total_price_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `total_price_tax_incl` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `price_calc_method` int(11) unsigned DEFAULT '0',
+ `id_tax_rules_group` int(11) unsigned DEFAULT '0',
+ `tax_computation_method` tinyint(1) unsigned NOT NULL DEFAULT '0',
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_booking_demand`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+CREATE TABLE IF NOT EXISTS `PREFIX_htl_booking_demands_tax` (
+ `id_booking_demand` int(11) NOT NULL AUTO_INCREMENT,
+ `id_tax` int(11) NOT NULL,
+ `unit_amount` DECIMAL(16, 6) NOT NULL DEFAULT '0.00',
+ `total_amount` DECIMAL(16, 6) NOT NULL DEFAULT '0.00',
+ PRIMARY KEY (`id_booking_demand`, `id_tax`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
CREATE TABLE IF NOT EXISTS `PREFIX_htl_room_status` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`status` text NOT NULL,
@@ -304,6 +318,8 @@ CREATE TABLE IF NOT EXISTS `PREFIX_htl_room_type_feature_pricing_lang` (
CREATE TABLE IF NOT EXISTS `PREFIX_htl_room_type_global_demand` (
`id_global_demand` int(11) NOT NULL AUTO_INCREMENT,
`price` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `id_tax_rules_group` int(10) unsigned NOT NULL DEFAULT '0',
+ `price_calc_method` tinyint(1) NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_global_demand`)
@@ -364,6 +380,13 @@ CREATE TABLE IF NOT EXISTS `PREFIX_htl_room_disable_dates` (
PRIMARY KEY (`id`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+CREATE TABLE IF NOT EXISTS `PREFIX_htl_access` (
+ `id_profile` int(10) unsigned NOT NULL,
+ `id_hotel` int(10) unsigned NOT NULL,
+ `access` int(11) NOT NULL,
+ PRIMARY KEY (`id_profile`, `id_hotel`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
insert into `PREFIX_htl_order_refund_stages` (`name`) values ('Waiting'),
('Accepted'),
('Refunded'),
diff --git a/modules/hotelreservationsystem/mails/ag/accepted_conf.html b/modules/hotelreservationsystem/mails/ag/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/ag/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/ag/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ag/accepted_conf.txt b/modules/hotelreservationsystem/mails/ag/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/ag/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/ag/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ag/refund_conf.html b/modules/hotelreservationsystem/mails/ag/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/ag/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/ag/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ag/refund_conf.txt b/modules/hotelreservationsystem/mails/ag/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/ag/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/ag/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ag/reject_conf.html b/modules/hotelreservationsystem/mails/ag/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/ag/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/ag/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ag/reject_conf.txt b/modules/hotelreservationsystem/mails/ag/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/ag/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/ag/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ag/request_processed.html b/modules/hotelreservationsystem/mails/ag/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/ag/request_processed.html
+++ b/modules/hotelreservationsystem/mails/ag/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ag/request_processed.txt b/modules/hotelreservationsystem/mails/ag/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/ag/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/ag/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ag/total_order_processed.html b/modules/hotelreservationsystem/mails/ag/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/ag/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/ag/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ag/total_order_processed.txt b/modules/hotelreservationsystem/mails/ag/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/ag/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/ag/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ar/accepted_conf.html b/modules/hotelreservationsystem/mails/ar/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/ar/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/ar/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ar/accepted_conf.txt b/modules/hotelreservationsystem/mails/ar/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/ar/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/ar/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ar/refund_conf.html b/modules/hotelreservationsystem/mails/ar/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/ar/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/ar/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ar/refund_conf.txt b/modules/hotelreservationsystem/mails/ar/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/ar/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/ar/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ar/reject_conf.html b/modules/hotelreservationsystem/mails/ar/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/ar/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/ar/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ar/reject_conf.txt b/modules/hotelreservationsystem/mails/ar/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/ar/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/ar/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ar/request_processed.html b/modules/hotelreservationsystem/mails/ar/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/ar/request_processed.html
+++ b/modules/hotelreservationsystem/mails/ar/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ar/request_processed.txt b/modules/hotelreservationsystem/mails/ar/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/ar/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/ar/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ar/total_order_processed.html b/modules/hotelreservationsystem/mails/ar/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/ar/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/ar/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ar/total_order_processed.txt b/modules/hotelreservationsystem/mails/ar/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/ar/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/ar/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/bg/accepted_conf.html b/modules/hotelreservationsystem/mails/bg/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/bg/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/bg/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/bg/accepted_conf.txt b/modules/hotelreservationsystem/mails/bg/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/bg/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/bg/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/bg/refund_conf.html b/modules/hotelreservationsystem/mails/bg/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/bg/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/bg/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/bg/refund_conf.txt b/modules/hotelreservationsystem/mails/bg/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/bg/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/bg/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/bg/reject_conf.html b/modules/hotelreservationsystem/mails/bg/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/bg/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/bg/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/bg/reject_conf.txt b/modules/hotelreservationsystem/mails/bg/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/bg/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/bg/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/bg/request_processed.html b/modules/hotelreservationsystem/mails/bg/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/bg/request_processed.html
+++ b/modules/hotelreservationsystem/mails/bg/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/bg/request_processed.txt b/modules/hotelreservationsystem/mails/bg/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/bg/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/bg/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/bg/total_order_processed.html b/modules/hotelreservationsystem/mails/bg/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/bg/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/bg/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/bg/total_order_processed.txt b/modules/hotelreservationsystem/mails/bg/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/bg/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/bg/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/br/accepted_conf.html b/modules/hotelreservationsystem/mails/br/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/br/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/br/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/br/accepted_conf.txt b/modules/hotelreservationsystem/mails/br/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/br/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/br/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/br/refund_conf.html b/modules/hotelreservationsystem/mails/br/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/br/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/br/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/br/refund_conf.txt b/modules/hotelreservationsystem/mails/br/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/br/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/br/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/br/reject_conf.html b/modules/hotelreservationsystem/mails/br/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/br/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/br/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/br/reject_conf.txt b/modules/hotelreservationsystem/mails/br/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/br/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/br/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/br/request_processed.html b/modules/hotelreservationsystem/mails/br/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/br/request_processed.html
+++ b/modules/hotelreservationsystem/mails/br/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/br/request_processed.txt b/modules/hotelreservationsystem/mails/br/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/br/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/br/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/br/total_order_processed.html b/modules/hotelreservationsystem/mails/br/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/br/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/br/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/br/total_order_processed.txt b/modules/hotelreservationsystem/mails/br/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/br/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/br/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ca/accepted_conf.html b/modules/hotelreservationsystem/mails/ca/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/ca/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/ca/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ca/accepted_conf.txt b/modules/hotelreservationsystem/mails/ca/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/ca/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/ca/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ca/refund_conf.html b/modules/hotelreservationsystem/mails/ca/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/ca/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/ca/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ca/refund_conf.txt b/modules/hotelreservationsystem/mails/ca/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/ca/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/ca/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ca/reject_conf.html b/modules/hotelreservationsystem/mails/ca/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/ca/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/ca/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ca/reject_conf.txt b/modules/hotelreservationsystem/mails/ca/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/ca/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/ca/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ca/request_processed.html b/modules/hotelreservationsystem/mails/ca/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/ca/request_processed.html
+++ b/modules/hotelreservationsystem/mails/ca/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ca/request_processed.txt b/modules/hotelreservationsystem/mails/ca/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/ca/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/ca/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/ca/total_order_processed.html b/modules/hotelreservationsystem/mails/ca/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/ca/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/ca/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/ca/total_order_processed.txt b/modules/hotelreservationsystem/mails/ca/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/ca/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/ca/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/de/accepted_conf.html b/modules/hotelreservationsystem/mails/de/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/de/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/de/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/de/accepted_conf.txt b/modules/hotelreservationsystem/mails/de/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/de/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/de/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/de/refund_conf.html b/modules/hotelreservationsystem/mails/de/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/de/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/de/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/de/refund_conf.txt b/modules/hotelreservationsystem/mails/de/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/de/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/de/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/de/reject_conf.html b/modules/hotelreservationsystem/mails/de/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/de/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/de/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/de/reject_conf.txt b/modules/hotelreservationsystem/mails/de/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/de/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/de/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/de/request_processed.html b/modules/hotelreservationsystem/mails/de/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/de/request_processed.html
+++ b/modules/hotelreservationsystem/mails/de/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/de/request_processed.txt b/modules/hotelreservationsystem/mails/de/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/de/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/de/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/de/total_order_processed.html b/modules/hotelreservationsystem/mails/de/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/de/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/de/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/de/total_order_processed.txt b/modules/hotelreservationsystem/mails/de/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/de/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/de/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/en/accepted_conf.html b/modules/hotelreservationsystem/mails/en/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/en/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/en/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/en/accepted_conf.txt b/modules/hotelreservationsystem/mails/en/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/en/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/en/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/en/refund_conf.html b/modules/hotelreservationsystem/mails/en/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/en/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/en/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/en/refund_conf.txt b/modules/hotelreservationsystem/mails/en/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/en/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/en/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/en/reject_conf.html b/modules/hotelreservationsystem/mails/en/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/en/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/en/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/en/reject_conf.txt b/modules/hotelreservationsystem/mails/en/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/en/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/en/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/en/request_processed.html b/modules/hotelreservationsystem/mails/en/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/en/request_processed.html
+++ b/modules/hotelreservationsystem/mails/en/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/en/request_processed.txt b/modules/hotelreservationsystem/mails/en/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/en/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/en/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/en/total_order_processed.html b/modules/hotelreservationsystem/mails/en/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/en/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/en/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/en/total_order_processed.txt b/modules/hotelreservationsystem/mails/en/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/en/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/en/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/es/accepted_conf.html b/modules/hotelreservationsystem/mails/es/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/es/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/es/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/es/accepted_conf.txt b/modules/hotelreservationsystem/mails/es/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/es/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/es/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/es/refund_conf.html b/modules/hotelreservationsystem/mails/es/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/es/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/es/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/es/refund_conf.txt b/modules/hotelreservationsystem/mails/es/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/es/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/es/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/es/reject_conf.html b/modules/hotelreservationsystem/mails/es/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/es/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/es/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/es/reject_conf.txt b/modules/hotelreservationsystem/mails/es/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/es/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/es/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/es/request_processed.html b/modules/hotelreservationsystem/mails/es/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/es/request_processed.html
+++ b/modules/hotelreservationsystem/mails/es/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/es/request_processed.txt b/modules/hotelreservationsystem/mails/es/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/es/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/es/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/es/total_order_processed.html b/modules/hotelreservationsystem/mails/es/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/es/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/es/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/es/total_order_processed.txt b/modules/hotelreservationsystem/mails/es/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/es/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/es/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/fr/accepted_conf.html b/modules/hotelreservationsystem/mails/fr/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/fr/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/fr/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/fr/accepted_conf.txt b/modules/hotelreservationsystem/mails/fr/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/fr/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/fr/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/fr/refund_conf.html b/modules/hotelreservationsystem/mails/fr/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/fr/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/fr/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/fr/refund_conf.txt b/modules/hotelreservationsystem/mails/fr/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/fr/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/fr/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/fr/reject_conf.html b/modules/hotelreservationsystem/mails/fr/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/fr/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/fr/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/fr/reject_conf.txt b/modules/hotelreservationsystem/mails/fr/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/fr/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/fr/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/fr/request_processed.html b/modules/hotelreservationsystem/mails/fr/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/fr/request_processed.html
+++ b/modules/hotelreservationsystem/mails/fr/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/fr/request_processed.txt b/modules/hotelreservationsystem/mails/fr/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/fr/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/fr/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/fr/total_order_processed.html b/modules/hotelreservationsystem/mails/fr/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/fr/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/fr/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/fr/total_order_processed.txt b/modules/hotelreservationsystem/mails/fr/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/fr/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/fr/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/gl/accepted_conf.html b/modules/hotelreservationsystem/mails/gl/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/gl/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/gl/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/gl/accepted_conf.txt b/modules/hotelreservationsystem/mails/gl/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/gl/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/gl/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/gl/refund_conf.html b/modules/hotelreservationsystem/mails/gl/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/gl/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/gl/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/gl/refund_conf.txt b/modules/hotelreservationsystem/mails/gl/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/gl/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/gl/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/gl/reject_conf.html b/modules/hotelreservationsystem/mails/gl/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/gl/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/gl/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/gl/reject_conf.txt b/modules/hotelreservationsystem/mails/gl/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/gl/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/gl/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/gl/request_processed.html b/modules/hotelreservationsystem/mails/gl/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/gl/request_processed.html
+++ b/modules/hotelreservationsystem/mails/gl/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/gl/request_processed.txt b/modules/hotelreservationsystem/mails/gl/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/gl/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/gl/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/gl/total_order_processed.html b/modules/hotelreservationsystem/mails/gl/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/gl/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/gl/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/gl/total_order_processed.txt b/modules/hotelreservationsystem/mails/gl/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/gl/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/gl/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/id/accepted_conf.html b/modules/hotelreservationsystem/mails/id/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/id/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/id/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/id/accepted_conf.txt b/modules/hotelreservationsystem/mails/id/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/id/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/id/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/id/refund_conf.html b/modules/hotelreservationsystem/mails/id/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/id/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/id/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/id/refund_conf.txt b/modules/hotelreservationsystem/mails/id/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/id/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/id/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/id/reject_conf.html b/modules/hotelreservationsystem/mails/id/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/id/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/id/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/id/reject_conf.txt b/modules/hotelreservationsystem/mails/id/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/id/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/id/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/id/request_processed.html b/modules/hotelreservationsystem/mails/id/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/id/request_processed.html
+++ b/modules/hotelreservationsystem/mails/id/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/id/request_processed.txt b/modules/hotelreservationsystem/mails/id/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/id/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/id/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/id/total_order_processed.html b/modules/hotelreservationsystem/mails/id/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/id/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/id/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/id/total_order_processed.txt b/modules/hotelreservationsystem/mails/id/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/id/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/id/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/nl/accepted_conf.html b/modules/hotelreservationsystem/mails/nl/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/nl/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/nl/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/nl/accepted_conf.txt b/modules/hotelreservationsystem/mails/nl/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/nl/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/nl/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/nl/refund_conf.html b/modules/hotelreservationsystem/mails/nl/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/nl/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/nl/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/nl/refund_conf.txt b/modules/hotelreservationsystem/mails/nl/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/nl/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/nl/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/nl/reject_conf.html b/modules/hotelreservationsystem/mails/nl/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/nl/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/nl/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/nl/reject_conf.txt b/modules/hotelreservationsystem/mails/nl/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/nl/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/nl/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/nl/request_processed.html b/modules/hotelreservationsystem/mails/nl/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/nl/request_processed.html
+++ b/modules/hotelreservationsystem/mails/nl/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/nl/request_processed.txt b/modules/hotelreservationsystem/mails/nl/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/nl/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/nl/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/nl/total_order_processed.html b/modules/hotelreservationsystem/mails/nl/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/nl/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/nl/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/nl/total_order_processed.txt b/modules/hotelreservationsystem/mails/nl/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/nl/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/nl/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/pl/accepted_conf.html b/modules/hotelreservationsystem/mails/pl/accepted_conf.html
index 16a8c349d..75f9ff88a 100644
--- a/modules/hotelreservationsystem/mails/pl/accepted_conf.html
+++ b/modules/hotelreservationsystem/mails/pl/accepted_conf.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/pl/accepted_conf.txt b/modules/hotelreservationsystem/mails/pl/accepted_conf.txt
index 0f228b5eb..c12b147c0 100644
--- a/modules/hotelreservationsystem/mails/pl/accepted_conf.txt
+++ b/modules/hotelreservationsystem/mails/pl/accepted_conf.txt
@@ -4,5 +4,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/pl/refund_conf.html b/modules/hotelreservationsystem/mails/pl/refund_conf.html
index f2c5cfcbd..124eb20d2 100644
--- a/modules/hotelreservationsystem/mails/pl/refund_conf.html
+++ b/modules/hotelreservationsystem/mails/pl/refund_conf.html
@@ -113,7 +113,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/pl/refund_conf.txt b/modules/hotelreservationsystem/mails/pl/refund_conf.txt
index 702f1d752..3b066c185 100644
--- a/modules/hotelreservationsystem/mails/pl/refund_conf.txt
+++ b/modules/hotelreservationsystem/mails/pl/refund_conf.txt
@@ -7,5 +7,5 @@ Cancellation Amount : {currency_sign} {cancellation_charge}
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/pl/reject_conf.html b/modules/hotelreservationsystem/mails/pl/reject_conf.html
index 888621698..0c24d864c 100644
--- a/modules/hotelreservationsystem/mails/pl/reject_conf.html
+++ b/modules/hotelreservationsystem/mails/pl/reject_conf.html
@@ -110,7 +110,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/pl/reject_conf.txt b/modules/hotelreservationsystem/mails/pl/reject_conf.txt
index 345f3c444..92e6441d2 100644
--- a/modules/hotelreservationsystem/mails/pl/reject_conf.txt
+++ b/modules/hotelreservationsystem/mails/pl/reject_conf.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/pl/request_processed.html b/modules/hotelreservationsystem/mails/pl/request_processed.html
index 6fa20b9c1..48fd82d76 100644
--- a/modules/hotelreservationsystem/mails/pl/request_processed.html
+++ b/modules/hotelreservationsystem/mails/pl/request_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/pl/request_processed.txt b/modules/hotelreservationsystem/mails/pl/request_processed.txt
index bb73fcfaa..0a0556f54 100644
--- a/modules/hotelreservationsystem/mails/pl/request_processed.txt
+++ b/modules/hotelreservationsystem/mails/pl/request_processed.txt
@@ -3,5 +3,5 @@ Your Booking Cancellation request of room type {product_name} from {date_from} T
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/mails/pl/total_order_processed.html b/modules/hotelreservationsystem/mails/pl/total_order_processed.html
index 9ed5aeb6e..b35c6892c 100644
--- a/modules/hotelreservationsystem/mails/pl/total_order_processed.html
+++ b/modules/hotelreservationsystem/mails/pl/total_order_processed.html
@@ -111,7 +111,7 @@
- {shop_name} powered by Webkul™
+ {shop_name} powered by Webkul™
diff --git a/modules/hotelreservationsystem/mails/pl/total_order_processed.txt b/modules/hotelreservationsystem/mails/pl/total_order_processed.txt
index d9ccff0e3..c56817de8 100644
--- a/modules/hotelreservationsystem/mails/pl/total_order_processed.txt
+++ b/modules/hotelreservationsystem/mails/pl/total_order_processed.txt
@@ -3,5 +3,5 @@ Your Cancellation request for all bookings in the order referene {order_referenc
You can review your order from the Order history section of your customer account by clicking My account on our shop.
{shop_name} [{shop_url}] powered by
-Webkul(tm) [https://webkul.com/]
+Webkul(tm) [https://webkul.com]
diff --git a/modules/hotelreservationsystem/views/js/roomSearchBlock.js b/modules/hotelreservationsystem/views/js/roomSearchBlock.js
index 0fe7c3b1e..544526393 100644
--- a/modules/hotelreservationsystem/views/js/roomSearchBlock.js
+++ b/modules/hotelreservationsystem/views/js/roomSearchBlock.js
@@ -59,9 +59,9 @@ $(document).ready(function() {
$('.location_search_results_ul').hide();
$("#check_in_time").datepicker({
- showOtherMonths: true,
dateFormat: 'dd-mm-yy',
minDate: 0,
+ dayNamesMin: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
//for calender Css
beforeShowDay: function (date) {
return highlightDateBorder($("#check_in_time").val(), date);
@@ -75,8 +75,8 @@ $(document).ready(function() {
});
$("#check_out_time").datepicker({
- showOtherMonths: true,
dateFormat: 'dd-mm-yy',
+ dayNamesMin: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
//for calender Css
beforeShowDay: function (date) {
return highlightDateBorder($("#check_out_time").val(), date);
diff --git a/modules/hotelreservationsystem/views/js/roomTypeGlobalDemand.js b/modules/hotelreservationsystem/views/js/roomTypeGlobalDemand.js
index 5b52457d1..270472434 100644
--- a/modules/hotelreservationsystem/views/js/roomTypeGlobalDemand.js
+++ b/modules/hotelreservationsystem/views/js/roomTypeGlobalDemand.js
@@ -20,10 +20,11 @@
$(document).ready(function() {
$("input[name='active_adv_option']").on('change', function () {
if (parseInt($(this).val())) {
- $(".adv_options_dtl").removeClass('hidden');
+ $("#price").closest('.form-group').hide(200);
+ $(".adv_options_dtl").show(200);
} else {
- $(".adv_options_dtl").addClass('hidden');
- $("#" + WK_CATALOG_ORDER_REWARD + "_advertise_theme_color_div").addClass('hidden');
+ $(".adv_options_dtl").hide(200);
+ $("#price").closest('.form-group').show(200);
}
});
diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
index 34bcc0d50..4c4c2ce55 100644
--- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
@@ -1,11 +1,12 @@
+
+
+
+
+ {/if}
{l s='Hotel Permissions'}
+| {l s='Hotel'} | ++ + {l s='All'} + | +||||
|---|---|---|---|---|---|
| {l s='No menu'} | +|||||
| {$hotelInfo['hotel_name']|escape:'html':'UTF-8'} | ++ + | +||||
{l s='Menu'}
| {if $is_child} » {/if}{$tab.name} | {foreach $perms as $perm} {if $access_edit == 1}
diff --git a/admin/themes/default/template/controllers/cart_rules/form.js b/admin/themes/default/template/controllers/cart_rules/form.js
index 9cd1abeca..784958d77 100644
--- a/admin/themes/default/template/controllers/cart_rules/form.js
+++ b/admin/themes/default/template/controllers/cart_rules/form.js
@@ -73,14 +73,60 @@ function toggleCartRuleFilter(id)
function removeCartRuleOption(item)
{
+ var error = 0;
var id = $(item).attr('id').replace('_remove', '');
- $('#' + id + '_2 option:selected').remove().appendTo('#' + id + '_1');
+ var selectedOpt = $('#' + id + '_2 option:selected');
+ var notAlloedRooms = [];
+ // validate if rooms with no hotel access are selected
+ $.each( selectedOpt, function( key, val ) {
+ if ($(this).attr('data-htl_access') == 0) {
+ notAlloedRooms.push($(this).text());
+ error = 1;
+ }
+ });
+ if (error == 0) {
+ selectedOpt.remove().appendTo('#' + id + '_1');;
+ } else {
+ var errorHtml = '';
+ errorHtml += room_access_err;
+ if (notAlloedRooms.length) {
+ errorHtml += ' ' + room_rmv_txt + '
' + room_rmv_txt + '
-
+
-
+
-
+
diff --git a/admin/themes/default/template/controllers/login/content.tpl b/admin/themes/default/template/controllers/login/content.tpl
index 8f5882e45..6d7c3e148 100644
--- a/admin/themes/default/template/controllers/login/content.tpl
+++ b/admin/themes/default/template/controllers/login/content.tpl
@@ -135,7 +135,7 @@
{hook h="displayAdminLogin"}
- + © Webkul™ 2015-{$smarty.now|date_format:"%Y"} - All rights reserved diff --git a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl new file mode 100644 index 000000000..ca7df51e9 --- /dev/null +++ b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl @@ -0,0 +1,71 @@ +{* +* 2010-2019 Webkul. +* +* NOTICE OF LICENSE +* +* All right is reserved, +* Please go through this link for complete license : https://store.webkul.com/license.html +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to newer +* versions in the future. If you wish to customize this module for your +* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. +* +* @author Webkul IN
+
+ {assign var=roomCount value=$roomCount+1}
+ {/foreach}
+{/if}
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
new file mode 100644
index 000000000..adac13275
--- /dev/null
+++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
@@ -0,0 +1,278 @@
+{*
+* 2010-2019 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through this link for complete license : https://store.webkul.com/license.html
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
+*
+* @author Webkul IN
+
+
+ {if isset($roomDemand['room_num']) && $roomDemand['room_num']}
+ {l s='Room'} {$roomDemand['room_num']|escape:'html':'UTF-8'}
+ {else}
+ {l s='Room'} {$roomCount|escape:'html':'UTF-8'}
+ {/if}
+
+
+
+ {if isset($roomTypeDemands) && $roomTypeDemands}
+ {foreach $roomTypeDemands as $idGlobalDemand => $demand}
+
+
+
+ {/foreach}
+ {/if}
+
+
+
+
+
+
+
+
+
+ {$demand['name']|escape:'html':'UTF-8'} + {if isset($demand['adv_option']) && $demand['adv_option']} + + {else} + + {/if} +
+
+ {if isset($selected_adv_option) && isset($demand['adv_option'][$selected_adv_option]['price'])}{convertPrice price = $demand['adv_option'][$selected_adv_option]['price']|escape:'html':'UTF-8'}{else}{convertPrice price = $demand['price']|escape:'html':'UTF-8'}{/if} +
+
+
+{* Modal for extra demands *}
+
+
+ {l s='Cart Details'}
+
+
+
+
+
+
+
+
+{strip}
+ {addJsDefL name=txtExtraDemandSucc}{l s='Updated Successfully' js=1}{/addJsDefL}
+ {addJsDefL name=txtExtraDemandErr}{l s='Some error occurred while updating demands' js=1}{/addJsDefL}
+{/strip}
+
+{* Css for handling extra demands changes *}
+
+
+{* JS for handling extra demands changes *}
+
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl
index b8aad2fa4..8ae14f489 100644
--- a/admin/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin/themes/default/template/controllers/orders/_product_line.tpl
@@ -39,7 +39,7 @@
+
+
+- {convertPriceWithCurrency price=$data['extra_demands_price'] currency=$currency->id} + {convertPriceWithCurrency price=$data['extra_demands_price_ti'] currency=$currency->id} {/if} |
diff --git a/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl b/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl
index ac5d17d93..fc38f5bb5 100644
--- a/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl
+++ b/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl
@@ -9,7 +9,7 @@
{foreach $roomDemand['extra_demands'] as $demand}
| {l s='Room No.'} | -{l s='Room Image'} | -{l s='Room Type'} | -{l s='Duration'} | -{l s='Unit Price (Tax incl.)'} | -{l s='Price (Tax excl.)'} | -{l s='Action'} | -
|---|---|---|---|---|---|---|
| {$data.room_num} | -{$data.room_type} | -{$data.date_from|date_format:"%d-%m-%Y"} - {$data.date_to|date_format:"%d-%m-%Y"} | -- - - {displayPrice price=$data.feature_price} - - | -{displayPrice price=$data.amt_with_qty} | -- - | -|
| {l s='No Room Found in the cart.'} | -
{block name="leadin"}{/block}
-{include file='controllers/orders/current_cart_details_data.tpl'}
+{include file='controllers/orders/_current_cart_details_data.tpl'}
@@ -1571,26 +1572,20 @@
-
+
- {l s='Total products'}
+ {l s='Total rooms (Tax excl.)'}
+ {l s='Total rooms (Tax excl.)'}
- {l s='Total vouchers (Tax excl.)'}
- + {l s='Total additinal facilties (Tax excl.)'}
+
- + {l s='Total additinal facilties (Tax excl.)'}
+
- {l s='Total taxes'}
- + {l s='Total vouchers (Tax excl.)'}
+
- + {l s='Total vouchers (Tax excl.)'}
+
@@ -1599,6 +1594,12 @@
+
+ {l s='Total taxes'}
+ +
+ + +
{l s='Total (Tax incl.)'}
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index f00dfe7cb..458b8cf0a 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1166,26 +1166,37 @@ {assign var=order_shipping_price value=$order->total_shipping_tax_incl} {/if}
- {l s='Total Rooms Cost'}
+ {l s='Total Rooms Cost (tax excl.)'}
{displayPrice price=$totalRoomsCostTE currency=$currency->id}
-
- {l s='Total Additional Facilities Cost'}
-
- {displayPrice price=$totalDemandsPrice currency=$currency->id}
-
-
-
+ {if isset($totalDemandsPriceTE) && $totalDemandsPriceTE > 0}
+
+ {l s='Additional Facilities Cost (tax excl.)'}
+
+ {displayPrice price=$totalDemandsPriceTE currency=$currency->id}
+
+
+
+ {/if}
- {l s='Total Tax'}
+ {l s='Total Rooms Tax'}
- {displayPrice price=$total_tax_in_order currency=$currency->id}
+ {displayPrice price=$total_room_tax currency=$currency->id}
+ {if isset($totalDemandsPriceTE) && $totalDemandsPriceTE > 0}
+
+ {l s='Additional Facilities Tax'}
+
+ {displayPrice price=($totalDemandsPriceTI - $totalDemandsPriceTE) currency=$currency->id}
+
+
+
+ {/if}
total_discounts_tax_incl == 0}style="display: none;"{/if}>
{l s='Discounts'}
@@ -1216,15 +1227,7 @@
-
- {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-
- {l s='Taxes'}
- {displayPrice price=($order->total_paid_tax_incl-$order->total_paid_tax_excl) currency=$currency->id}
-
-
- {/if}
- *}
+
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index f00dfe7cb..458b8cf0a 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1166,26 +1166,37 @@ {assign var=order_shipping_price value=$order->total_shipping_tax_incl} {/if}
{l s='(%s)' sprintf=$smarty.capture.TaxMethod}
-
| @@ -89,7 +89,7 @@ {employee} wanted to forward this discussion to you. |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -124,7 +124,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| diff --git a/mails/en/header_order_conf.html b/mails/en/header_order_conf.html index 238b2486d..f9c849f91 100644 --- a/mails/en/header_order_conf.html +++ b/mails/en/header_order_conf.html @@ -4,58 +4,58 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| diff --git a/mails/en/hotel-booking-cart-data.tpl b/mails/en/hotel-booking-cart-data.tpl index d1161a822..9389a895b 100644 --- a/mails/en/hotel-booking-cart-data.tpl +++ b/mails/en/hotel-booking-cart-data.tpl @@ -109,53 +109,10 @@ |
{l s='Additional Facilities Details'}
-| {l s='Room'} - {$roomCount} |
- {assign var=roomCount value=$roomCount+1}
- {/foreach}
-
|---|
|
- {foreach $roomDemands['extra_demands'] as $demand}
- - - - {$demand['name']} - - - - - - {convertPrice price=$demand['price']} - - - - {/foreach} - |
- {/foreach}
-
| @@ -122,7 +122,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -102,7 +102,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -83,7 +83,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -120,7 +120,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -120,7 +120,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| Room Image | -Room Description | -Room Capcity | -Unit Price | -Rooms Qty | -Check-in Date | -Check-out Date | -Total | -Room Image | +Room Description | +Room Capcity | +Unit Price | +Rooms Qty | +Check-in Date | +Check-out Date | +Total | +
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {cart_booking_data_html} | ||||||||||||
| + | + {extra_demands_details_html} + | +|||||||||||
| {discounts} | - {total_extra_demands} + {total_extra_demands_te} | @@ -209,42 +215,14 @@ | ||||||||||
| - Total Tax paid + Additional Facilities Tax | @@ -285,7 +264,7 @@ | - {total_tax_paid} + {extra_demands_tax} | @@ -331,26 +310,6 @@ - | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - {shop_name} creado por Webkul™ + {shop_name} creado por Webkul™ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| @@ -101,7 +101,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -101,7 +101,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -102,7 +102,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -101,7 +101,7 @@ |
| - {shop_name} réalisé avec PrestaShop™ + {shop_name} réalisé avec Webkul™ |
| @@ -101,7 +101,7 @@ |
| - {shop_name} réalisé avec PrestaShop™ + {shop_name} réalisé avec Webkul™ |
| @@ -102,7 +102,7 @@ |
| - {shop_name} réalisé avec PrestaShop™ + {shop_name} réalisé avec Webkul™ |
| @@ -103,7 +103,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -103,7 +103,7 @@ |
| - {shop_name} powered by PrestaShop™ + {shop_name} powered by Webkul™ |
| @@ -103,7 +103,7 @@ |
| - {shop_name} réalisé avec PrestaShop™ + {shop_name} réalisé avec Webkul™ |
| @@ -103,7 +103,7 @@ |
| - {shop_name} réalisé avec PrestaShop™ + {shop_name} réalisé avec Webkul™ |
{if isset($edit)}
- {l s='Edit Hotel' mod='hotelreservationsystem'}
+ {l s='Edit Hotel' mod='hotelreservationsystem'}
{else}
- {l s='Add New Hotel' mod='hotelreservationsystem'}
+ {l s='Add New Hotel' mod='hotelreservationsystem'}
{/if}
+