-
+
- {if isset($room['selected_demands']) && $room['selected_demands']}
-
-
- {/if}
{if isset($room['selected_services']) && $room['selected_services']}
-
- {if isset($room['selected_demands']) && $room['selected_demands']}
- {assign var=roomCount value=1}
- {foreach $room['selected_demands'] as $demand}
-
-
-
- {assign var=roomCount value=$roomCount+1}
- {/foreach}
- {/if}
-
- {if isset($room['selected_demands']) && $room['selected_demands']}
- {foreach $room['extra_demands'] as $idGlobalDemand => $roomDemand}
- {if $demand.id_global_demand == $idGlobalDemand}
-
-
-
- {/if}
- {/foreach}
- {/if}
-
-
-
-
-
-
-
- {$roomDemand['name']|escape:'html':'UTF-8'}
- {if isset($roomDemand['adv_option']) && $roomDemand['adv_option']}
- {$roomDemand['adv_option'][$demand['id_option']]['name']}
- {/if}
-
-
- - {if isset($roomDemand['adv_option']) && $roomDemand['adv_option']} - {convertPrice price = $roomDemand['adv_option'][$demand['id_option']]['price_tax_excl']|escape:'html':'UTF-8'} - {else} - {convertPrice price = $roomDemand['price_tax_excl']|escape:'html':'UTF-8'} - {/if} -
-
+
{assign var=roomCount value=1}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 9e5658518..e6fb3f0c0 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -911,6 +911,12 @@
1
+
+ 0
+
+
+ 0
+
1
diff --git a/install/data/xml/source.xml b/install/data/xml/source.xml
new file mode 100644
index 000000000..707c7c0eb
--- /dev/null
+++ b/install/data/xml/source.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install/data/xml/tab.xml b/install/data/xml/tab.xml
index 8c8205a9b..538da95e3 100644
--- a/install/data/xml/tab.xml
+++ b/install/data/xml/tab.xml
@@ -117,6 +117,9 @@
AdminStatuses
+
+ AdminSources
+
AdminOrderMessage
diff --git a/install/langs/bg/data/business_source.xml b/install/langs/bg/data/business_source.xml
new file mode 100644
index 000000000..1e6d1d5a3
--- /dev/null
+++ b/install/langs/bg/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Директен
+
+
+ OTA
+
+
+ Корпоративен
+
+
+ Туристическа агенция
+
+
+ Група
+
+
+ API
+
+
diff --git a/install/langs/bg/data/source.xml b/install/langs/bg/data/source.xml
new file mode 100644
index 000000000..d52cff723
--- /dev/null
+++ b/install/langs/bg/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Директен уебсайт
+
+
+ Без резервация
+
+
+ Телефон
+
+
+ Имейл
+
+
+ Социални медии
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API поръчка
+
+
diff --git a/install/langs/bn/data/business_source.xml b/install/langs/bn/data/business_source.xml
new file mode 100644
index 000000000..b2711ce28
--- /dev/null
+++ b/install/langs/bn/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ সরাসরি
+
+
+ OTA
+
+
+ কর্পোরেট
+
+
+ ট্রাভেল এজেন্ট
+
+
+ গ্রুপ
+
+
+ API
+
+
diff --git a/install/langs/bn/data/source.xml b/install/langs/bn/data/source.xml
new file mode 100644
index 000000000..2bd5ccb5d
--- /dev/null
+++ b/install/langs/bn/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ সরাসরি ওয়েবসাইট
+
+
+ ওয়াক-ইন
+
+
+ ফোন
+
+
+ ইমেইল
+
+
+ সোশ্যাল মিডিয়া
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API অর্ডার
+
+
diff --git a/install/langs/br/data/business_source.xml b/install/langs/br/data/business_source.xml
new file mode 100644
index 000000000..55240b725
--- /dev/null
+++ b/install/langs/br/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direto
+
+
+ OTA
+
+
+ Corporativo
+
+
+ Agência de Viagens
+
+
+ Grupo
+
+
+ API
+
+
diff --git a/install/langs/br/data/source.xml b/install/langs/br/data/source.xml
new file mode 100644
index 000000000..65d602c1c
--- /dev/null
+++ b/install/langs/br/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Site Direto
+
+
+ Sem Reserva
+
+
+ Telefone
+
+
+ E-mail
+
+
+ Redes Sociais
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Pedido API
+
+
diff --git a/install/langs/cs/data/business_source.xml b/install/langs/cs/data/business_source.xml
new file mode 100644
index 000000000..eb74264fd
--- /dev/null
+++ b/install/langs/cs/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Přímý
+
+
+ OTA
+
+
+ Firemní
+
+
+ Cestovní kancelář
+
+
+ Skupina
+
+
+ API
+
+
diff --git a/install/langs/cs/data/source.xml b/install/langs/cs/data/source.xml
new file mode 100644
index 000000000..995df6040
--- /dev/null
+++ b/install/langs/cs/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Přímé webové stránky
+
+
+ Bez rezervace
+
+
+ Telefon
+
+
+ E-mail
+
+
+ Sociální média
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API objednávka
+
+
diff --git a/install/langs/de/data/business_source.xml b/install/langs/de/data/business_source.xml
new file mode 100644
index 000000000..62ff77c54
--- /dev/null
+++ b/install/langs/de/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direkt
+
+
+ OTA
+
+
+ Firmenkunden
+
+
+ Reisebüro
+
+
+ Gruppe
+
+
+ API
+
+
diff --git a/install/langs/de/data/source.xml b/install/langs/de/data/source.xml
new file mode 100644
index 000000000..e57b3b915
--- /dev/null
+++ b/install/langs/de/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Direkte Website
+
+
+ Laufkundschaft
+
+
+ Telefon
+
+
+ E-Mail
+
+
+ Soziale Medien
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API-Bestellung
+
+
diff --git a/install/langs/en/data/business_source.xml b/install/langs/en/data/business_source.xml
new file mode 100644
index 000000000..ca736bac3
--- /dev/null
+++ b/install/langs/en/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direct
+
+
+ OTA
+
+
+ Corporate
+
+
+ Travel Agent
+
+
+ Group
+
+
+ API
+
+
diff --git a/install/langs/en/data/source.xml b/install/langs/en/data/source.xml
new file mode 100644
index 000000000..3129c97c9
--- /dev/null
+++ b/install/langs/en/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Direct Website
+
+
+ Walk-in
+
+
+ Phone
+
+
+ Email
+
+
+ Social Media
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API Order
+
+
diff --git a/install/langs/en/data/tab.xml b/install/langs/en/data/tab.xml
index a47774d51..791f58a5a 100644
--- a/install/langs/en/data/tab.xml
+++ b/install/langs/en/data/tab.xml
@@ -37,6 +37,7 @@
+
+ Directo
+
+
+ OTA
+
+
+ Corporativo
+
+
+ Agencia de Viajes
+
+
+ Grupo
+
+
+ API
+
+
diff --git a/install/langs/es/data/source.xml b/install/langs/es/data/source.xml
new file mode 100644
index 000000000..8b4a4c363
--- /dev/null
+++ b/install/langs/es/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Sitio Web Directo
+
+
+ Sin reserva
+
+
+ Teléfono
+
+
+ Correo electrónico
+
+
+ Redes Sociales
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Pedido API
+
+
diff --git a/install/langs/fa/data/business_source.xml b/install/langs/fa/data/business_source.xml
new file mode 100644
index 000000000..162a28b14
--- /dev/null
+++ b/install/langs/fa/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ مستقیم
+
+
+ OTA
+
+
+ سازمانی
+
+
+ آژانس مسافرتی
+
+
+ گروه
+
+
+ API
+
+
diff --git a/install/langs/fa/data/source.xml b/install/langs/fa/data/source.xml
new file mode 100644
index 000000000..41b725ac8
--- /dev/null
+++ b/install/langs/fa/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ وبسایت مستقیم
+
+
+ مراجعه حضوری
+
+
+ تلفن
+
+
+ ایمیل
+
+
+ رسانههای اجتماعی
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ سفارش API
+
+
diff --git a/install/langs/fr/data/business_source.xml b/install/langs/fr/data/business_source.xml
new file mode 100644
index 000000000..f69138d88
--- /dev/null
+++ b/install/langs/fr/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direct
+
+
+ OTA
+
+
+ Entreprise
+
+
+ Agence de Voyage
+
+
+ Groupe
+
+
+ API
+
+
diff --git a/install/langs/fr/data/source.xml b/install/langs/fr/data/source.xml
new file mode 100644
index 000000000..9a93d2479
--- /dev/null
+++ b/install/langs/fr/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Site Web Direct
+
+
+ Sans réservation
+
+
+ Téléphone
+
+
+ E-mail
+
+
+ Réseaux Sociaux
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Commande API
+
+
diff --git a/install/langs/he/data/business_source.xml b/install/langs/he/data/business_source.xml
new file mode 100644
index 000000000..b0a0fbfb0
--- /dev/null
+++ b/install/langs/he/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ ישיר
+
+
+ OTA
+
+
+ עסקי
+
+
+ סוכנות נסיעות
+
+
+ קבוצה
+
+
+ API
+
+
diff --git a/install/langs/he/data/source.xml b/install/langs/he/data/source.xml
new file mode 100644
index 000000000..be275f519
--- /dev/null
+++ b/install/langs/he/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ אתר אינטרנט ישיר
+
+
+ הגעה ללא הזמנה
+
+
+ טלפון
+
+
+ אימייל
+
+
+ מדיה חברתית
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ הזמנת API
+
+
diff --git a/install/langs/hr/data/business_source.xml b/install/langs/hr/data/business_source.xml
new file mode 100644
index 000000000..c48f55f80
--- /dev/null
+++ b/install/langs/hr/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Izravno
+
+
+ OTA
+
+
+ Poslovni
+
+
+ Putnička Agencija
+
+
+ Grupa
+
+
+ API
+
+
diff --git a/install/langs/hr/data/source.xml b/install/langs/hr/data/source.xml
new file mode 100644
index 000000000..5e09b1553
--- /dev/null
+++ b/install/langs/hr/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Izravna Web Stranica
+
+
+ Bez rezervacije
+
+
+ Telefon
+
+
+ E-pošta
+
+
+ Društveni Mediji
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API narudžba
+
+
diff --git a/install/langs/hu/data/business_source.xml b/install/langs/hu/data/business_source.xml
new file mode 100644
index 000000000..f3e68970b
--- /dev/null
+++ b/install/langs/hu/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Közvetlen
+
+
+ OTA
+
+
+ Vállalati
+
+
+ Utazási Iroda
+
+
+ Csoport
+
+
+ API
+
+
diff --git a/install/langs/hu/data/source.xml b/install/langs/hu/data/source.xml
new file mode 100644
index 000000000..5620de387
--- /dev/null
+++ b/install/langs/hu/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Közvetlen Weboldal
+
+
+ Foglalás Nélküli
+
+
+ Telefon
+
+
+ E-mail
+
+
+ Közösségi Média
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API rendelés
+
+
diff --git a/install/langs/id/data/business_source.xml b/install/langs/id/data/business_source.xml
new file mode 100644
index 000000000..6d46eb00d
--- /dev/null
+++ b/install/langs/id/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Langsung
+
+
+ OTA
+
+
+ Korporat
+
+
+ Agen Perjalanan
+
+
+ Grup
+
+
+ API
+
+
diff --git a/install/langs/id/data/source.xml b/install/langs/id/data/source.xml
new file mode 100644
index 000000000..f249e90dc
--- /dev/null
+++ b/install/langs/id/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Situs Web Langsung
+
+
+ Tanpa Reservasi
+
+
+ Telepon
+
+
+ Email
+
+
+ Media Sosial
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Pesanan API
+
+
diff --git a/install/langs/it/data/business_source.xml b/install/langs/it/data/business_source.xml
new file mode 100644
index 000000000..4c96f4db3
--- /dev/null
+++ b/install/langs/it/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Diretto
+
+
+ OTA
+
+
+ Aziendale
+
+
+ Agenzia di Viaggi
+
+
+ Gruppo
+
+
+ API
+
+
diff --git a/install/langs/it/data/source.xml b/install/langs/it/data/source.xml
new file mode 100644
index 000000000..e65882222
--- /dev/null
+++ b/install/langs/it/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Sito Web Diretto
+
+
+ Senza prenotazione
+
+
+ Telefono
+
+
+ Email
+
+
+ Social Media
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Ordine API
+
+
diff --git a/install/langs/lt/data/business_source.xml b/install/langs/lt/data/business_source.xml
new file mode 100644
index 000000000..957b71f5c
--- /dev/null
+++ b/install/langs/lt/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Tiesioginis
+
+
+ OTA
+
+
+ Įmonės
+
+
+ Kelionių Agentūra
+
+
+ Grupė
+
+
+ API
+
+
diff --git a/install/langs/lt/data/source.xml b/install/langs/lt/data/source.xml
new file mode 100644
index 000000000..c626ee59b
--- /dev/null
+++ b/install/langs/lt/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Tiesioginė Svetainė
+
+
+ Be Rezervacijos
+
+
+ Telefonas
+
+
+ El. Paštas
+
+
+ Socialiniai Tinklai
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API užsakymas
+
+
diff --git a/install/langs/mk/data/business_source.xml b/install/langs/mk/data/business_source.xml
new file mode 100644
index 000000000..e6f20c84d
--- /dev/null
+++ b/install/langs/mk/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Директно
+
+
+ OTA
+
+
+ Корпоративно
+
+
+ Патничка Агенција
+
+
+ Група
+
+
+ API
+
+
diff --git a/install/langs/mk/data/source.xml b/install/langs/mk/data/source.xml
new file mode 100644
index 000000000..ad16f305f
--- /dev/null
+++ b/install/langs/mk/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Директна Веб-страница
+
+
+ Без резервација
+
+
+ Телефон
+
+
+ Е-пошта
+
+
+ Социјални Медиуми
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API нарачка
+
+
diff --git a/install/langs/nl/data/business_source.xml b/install/langs/nl/data/business_source.xml
new file mode 100644
index 000000000..4755293bd
--- /dev/null
+++ b/install/langs/nl/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direct
+
+
+ OTA
+
+
+ Zakelijk
+
+
+ Reisbureau
+
+
+ Groep
+
+
+ API
+
+
diff --git a/install/langs/nl/data/source.xml b/install/langs/nl/data/source.xml
new file mode 100644
index 000000000..18f817ee0
--- /dev/null
+++ b/install/langs/nl/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Directe Website
+
+
+ Zonder Reservering
+
+
+ Telefoon
+
+
+ E-mail
+
+
+ Sociale Media
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API-bestelling
+
+
diff --git a/install/langs/no/data/business_source.xml b/install/langs/no/data/business_source.xml
new file mode 100644
index 000000000..50b17dab6
--- /dev/null
+++ b/install/langs/no/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direkte
+
+
+ OTA
+
+
+ Bedrift
+
+
+ Reisebyrå
+
+
+ Gruppe
+
+
+ API
+
+
diff --git a/install/langs/no/data/source.xml b/install/langs/no/data/source.xml
new file mode 100644
index 000000000..5dfabae39
--- /dev/null
+++ b/install/langs/no/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Direkte Nettside
+
+
+ Uten Reservasjon
+
+
+ Telefon
+
+
+ E-post
+
+
+ Sosiale Medier
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API-bestilling
+
+
diff --git a/install/langs/pl/data/business_source.xml b/install/langs/pl/data/business_source.xml
new file mode 100644
index 000000000..af4f73cf3
--- /dev/null
+++ b/install/langs/pl/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Bezpośredni
+
+
+ OTA
+
+
+ Firmowy
+
+
+ Biuro Podróży
+
+
+ Grupa
+
+
+ API
+
+
diff --git a/install/langs/pl/data/source.xml b/install/langs/pl/data/source.xml
new file mode 100644
index 000000000..2a9c9ea30
--- /dev/null
+++ b/install/langs/pl/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Bezpośrednia Strona Internetowa
+
+
+ Bez Rezerwacji
+
+
+ Telefon
+
+
+ E-mail
+
+
+ Media Społecznościowe
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Zamówienie API
+
+
diff --git a/install/langs/pt/data/business_source.xml b/install/langs/pt/data/business_source.xml
new file mode 100644
index 000000000..55240b725
--- /dev/null
+++ b/install/langs/pt/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direto
+
+
+ OTA
+
+
+ Corporativo
+
+
+ Agência de Viagens
+
+
+ Grupo
+
+
+ API
+
+
diff --git a/install/langs/pt/data/source.xml b/install/langs/pt/data/source.xml
new file mode 100644
index 000000000..65d602c1c
--- /dev/null
+++ b/install/langs/pt/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Site Direto
+
+
+ Sem Reserva
+
+
+ Telefone
+
+
+ E-mail
+
+
+ Redes Sociais
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Pedido API
+
+
diff --git a/install/langs/qc/data/business_source.xml b/install/langs/qc/data/business_source.xml
new file mode 100644
index 000000000..f69138d88
--- /dev/null
+++ b/install/langs/qc/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direct
+
+
+ OTA
+
+
+ Entreprise
+
+
+ Agence de Voyage
+
+
+ Groupe
+
+
+ API
+
+
diff --git a/install/langs/qc/data/source.xml b/install/langs/qc/data/source.xml
new file mode 100644
index 000000000..159b1d937
--- /dev/null
+++ b/install/langs/qc/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Site Web Direct
+
+
+ Sans réservation
+
+
+ Téléphone
+
+
+ Courriel
+
+
+ Médias Sociaux
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Commande API
+
+
diff --git a/install/langs/ro/data/business_source.xml b/install/langs/ro/data/business_source.xml
new file mode 100644
index 000000000..3cfae5e22
--- /dev/null
+++ b/install/langs/ro/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direct
+
+
+ OTA
+
+
+ Corporativ
+
+
+ Agenție de Turism
+
+
+ Grup
+
+
+ API
+
+
diff --git a/install/langs/ro/data/source.xml b/install/langs/ro/data/source.xml
new file mode 100644
index 000000000..ec61d8982
--- /dev/null
+++ b/install/langs/ro/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Site Web Direct
+
+
+ Fără Rezervare
+
+
+ Telefon
+
+
+ E-mail
+
+
+ Rețele Sociale
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Comandă API
+
+
diff --git a/install/langs/ru/data/business_source.xml b/install/langs/ru/data/business_source.xml
new file mode 100644
index 000000000..ff653dcb4
--- /dev/null
+++ b/install/langs/ru/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Прямой
+
+
+ OTA
+
+
+ Корпоративный
+
+
+ Турагентство
+
+
+ Группа
+
+
+ API
+
+
diff --git a/install/langs/ru/data/source.xml b/install/langs/ru/data/source.xml
new file mode 100644
index 000000000..dc48395ef
--- /dev/null
+++ b/install/langs/ru/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Прямой сайт
+
+
+ Без бронирования
+
+
+ Телефон
+
+
+ Эл. почта
+
+
+ Социальные сети
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Заказ через API
+
+
diff --git a/install/langs/si/data/business_source.xml b/install/langs/si/data/business_source.xml
new file mode 100644
index 000000000..59f36c869
--- /dev/null
+++ b/install/langs/si/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ සෘජු
+
+
+ OTA
+
+
+ සංස්ථාපිත
+
+
+ සංචාරක නියෝජිත ආයතනය
+
+
+ කණ්ඩායම
+
+
+ API
+
+
diff --git a/install/langs/si/data/source.xml b/install/langs/si/data/source.xml
new file mode 100644
index 000000000..211c1dc75
--- /dev/null
+++ b/install/langs/si/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ සෘජු වෙබ් අඩවිය
+
+
+ වෙන් කිරීමකින් තොරව
+
+
+ දුරකථනය
+
+
+ විද්යුත් තැපෑල
+
+
+ සමාජ මාධ්ය
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API ඇණවුම
+
+
diff --git a/install/langs/sr/data/business_source.xml b/install/langs/sr/data/business_source.xml
new file mode 100644
index 000000000..5f6b74237
--- /dev/null
+++ b/install/langs/sr/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Директно
+
+
+ OTA
+
+
+ Пословно
+
+
+ Туристичка Агенција
+
+
+ Група
+
+
+ API
+
+
diff --git a/install/langs/sr/data/source.xml b/install/langs/sr/data/source.xml
new file mode 100644
index 000000000..eddb3b9a9
--- /dev/null
+++ b/install/langs/sr/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Директна Веб Страница
+
+
+ Без Резервације
+
+
+ Телефон
+
+
+ Е-пошта
+
+
+ Друштвени Медији
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API наруџбина
+
+
diff --git a/install/langs/sv/data/business_source.xml b/install/langs/sv/data/business_source.xml
new file mode 100644
index 000000000..ceba7eda7
--- /dev/null
+++ b/install/langs/sv/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Direkt
+
+
+ OTA
+
+
+ Företag
+
+
+ Resebyrå
+
+
+ Grupp
+
+
+ API
+
+
diff --git a/install/langs/sv/data/source.xml b/install/langs/sv/data/source.xml
new file mode 100644
index 000000000..0882bff0b
--- /dev/null
+++ b/install/langs/sv/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Direkt Webbplats
+
+
+ Utan Bokning
+
+
+ Telefon
+
+
+ E-post
+
+
+ Sociala Medier
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API-beställning
+
+
diff --git a/install/langs/tw/data/business_source.xml b/install/langs/tw/data/business_source.xml
new file mode 100644
index 000000000..4fc60dbf2
--- /dev/null
+++ b/install/langs/tw/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ 直接
+
+
+ OTA
+
+
+ 企業
+
+
+ 旅行社
+
+
+ 團體
+
+
+ API
+
+
diff --git a/install/langs/tw/data/source.xml b/install/langs/tw/data/source.xml
new file mode 100644
index 000000000..5f11ab2dd
--- /dev/null
+++ b/install/langs/tw/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ 官方網站
+
+
+ 現場入住
+
+
+ 電話
+
+
+ 電子郵件
+
+
+ 社群媒體
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API 訂單
+
+
diff --git a/install/langs/vn/data/business_source.xml b/install/langs/vn/data/business_source.xml
new file mode 100644
index 000000000..7f01299af
--- /dev/null
+++ b/install/langs/vn/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ Trực tiếp
+
+
+ OTA
+
+
+ Doanh nghiệp
+
+
+ Đại lý Du lịch
+
+
+ Nhóm
+
+
+ API
+
+
diff --git a/install/langs/vn/data/source.xml b/install/langs/vn/data/source.xml
new file mode 100644
index 000000000..84a3b662a
--- /dev/null
+++ b/install/langs/vn/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ Trang Web Trực tiếp
+
+
+ Không đặt trước
+
+
+ Điện thoại
+
+
+ Email
+
+
+ Mạng Xã hội
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ Đơn hàng API
+
+
diff --git a/install/langs/zh/data/business_source.xml b/install/langs/zh/data/business_source.xml
new file mode 100644
index 000000000..8d5138e70
--- /dev/null
+++ b/install/langs/zh/data/business_source.xml
@@ -0,0 +1,21 @@
+
+
+
+ 直接
+
+
+ OTA
+
+
+ 企业
+
+
+ 旅行社
+
+
+ 团体
+
+
+ API
+
+
diff --git a/install/langs/zh/data/source.xml b/install/langs/zh/data/source.xml
new file mode 100644
index 000000000..a177714ff
--- /dev/null
+++ b/install/langs/zh/data/source.xml
@@ -0,0 +1,57 @@
+
+
+
+ 官方网站
+
+
+ 现场入住
+
+
+ 电话
+
+
+ 电子邮件
+
+
+ 社交媒体
+
+
+ WhatsApp
+
+
+ Booking.com
+
+
+ Expedia
+
+
+ GoMMT (GoIbibo/MakeMyTrip)
+
+
+ Agoda
+
+
+ Airbnb
+
+
+ Trip.com (Ctrip)
+
+
+ Bakuun
+
+
+ Despegar
+
+
+ Yatra
+
+
+ Hostelworld
+
+
+ HyperGuest
+
+
+ API 订单
+
+
diff --git a/install/models/install.php b/install/models/install.php
index 32d939aeb..c665e028f 100644
--- a/install/models/install.php
+++ b/install/models/install.php
@@ -540,6 +540,14 @@ class InstallModelInstall extends InstallAbstractModel
Configuration::updateGlobalValue('PS_OS_OUTOFSTOCK_PAID', (int)Configuration::get('PS_OS_OUTOFSTOCK'));
}
+ // Set the default Booking Source (Direct Website)
+ $id_default_source = (int)Db::getInstance()->getValue(
+ 'SELECT `id_source` FROM '._DB_PREFIX_.'source WHERE `code` = \'DIRECT_WEBSITE\''
+ );
+ if ($id_default_source) {
+ Configuration::updateGlobalValue('PS_DEFAULT_BOOKING_SOURCE', $id_default_source);
+ }
+
// Set logo configuration
if (file_exists(_PS_IMG_DIR_.'logo.png')) {
list($width, $height) = getimagesize(_PS_IMG_DIR_.'logo.png');
@@ -623,15 +631,15 @@ class InstallModelInstall extends InstallAbstractModel
public function setNotification($notificationData)
{
if (function_exists('curl_version')) {
+ $url = _QLO_API_URL_.'/getNotification.php';
$params = [
- 'url' => 'https://prestashop.webkul.com/hotel-reservation-clients/getNotification.php',
'method' => 'POST',
'headers' => array('Content-Type: application/json'),
'postdata' => json_encode($notificationData),
];
$curlInit = curl_init();
- curl_setopt($curlInit, CURLOPT_URL, $params['url']);
+ curl_setopt($curlInit, CURLOPT_URL, $url);
curl_setopt($curlInit, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
curl_setopt($curlInit, CURLOPT_HTTPHEADER, $params['headers']);
curl_setopt($curlInit, CURLOPT_SSL_VERIFYPEER, false);
diff --git a/js/admin.js b/js/admin.js
index b42e2e297..26c8d29f9 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -504,6 +504,14 @@ function changeCMSActivationAuthorization()
getE('PS_CONDITIONS_CMS_ID').disabled = 'disabled';
}
+function toggleNationalityMandatoryField()
+{
+ if ($('#PS_CUSTOMER_NATIONALITY_on').prop('checked'))
+ $('#conf_id_PS_CUSTOMER_NATIONALITY_MANDATORY').closest('.form-group').show();
+ else
+ $('#conf_id_PS_CUSTOMER_NATIONALITY_MANDATORY').closest('.form-group').hide();
+}
+
function changeOverbookingOrderAction()
{
if (getE('PS_OVERBOOKING_ORDER_ACTION').value == $("input[name='OVERBOOKING_ORDER_CANCEL_ACTION']").val())
@@ -998,6 +1006,10 @@ $(document).ready(function()
if ($('.kpi-container').length) {
refresh_kpis();
}
+ if ($('#PS_CUSTOMER_NATIONALITY_on').length) {
+ toggleNationalityMandatoryField();
+ $('input[name="PS_CUSTOMER_NATIONALITY"]').on('change', toggleNationalityMandatoryField);
+ }
});
function bindSwapSave()
diff --git a/js/admin/orders.js b/js/admin/orders.js
index 0f3a5a38a..49beadcec 100644
--- a/js/admin/orders.js
+++ b/js/admin/orders.js
@@ -25,9 +25,7 @@
var current_product = null;
var ajaxQueries = new Array();
-if (typeof jQuery !== 'undefined' && jQuery.effects && !jQuery.effects.effect) {
- jQuery.effects.effect = {};
-}
+
$(document).ready(function() {
// Init all events
init();
@@ -1048,24 +1046,7 @@ $(document).ready(function() {
actualizeRefundVoucher();
});
- // when choose to add new facilities while additional facilities edit
- $(document).on('click', '#btn_new_room_demand', function() {
- $('.room_demands_container').show();
- $('#save_room_demands').show();
- $('#back_to_demands_btn').show();
- $('.room_ordered_demands').hide();
- $('#btn_new_room_demand').hide();
- });
- // click on back button on created facilities while additional facilities edit
- $(document).on('click', '#back_to_demands_btn', function() {
- $('.room_ordered_demands').show();
- $('#btn_new_room_demand').show();
- $('.room_demands_container').hide();
- $('#save_room_demands').hide();
- $('#back_to_demands_btn').hide();
- });
-
- // click on back button on created facilities while additional facilities edit
+ // click on back button on created extra service edit
$(document).on('click', '#back_to_service_btn', function() {
$('.room_ordered_services').show();
$('#btn_new_existing_room_service').show();
@@ -1140,7 +1121,7 @@ $(document).ready(function() {
if (jsonData.service_panel) {
$('#room_type_service_product_desc').replaceWith(jsonData.service_panel);
}
- showSuccessMessage(txtExtraDemandSucc);
+ showSuccessMessage(txtExtraServiceSucc);
} else {
var errorHtml = error_found_txt + ':
'; errorHtml += '
+
';
return $str_return;
}
+
+ protected function displayMailAvailableVariables($mail_files)
+ {
+ $variables = $this->getMailTemplateVariables($mail_files);
+ if (empty($variables)) {
+ return '';
+ }
+
+ $str_return = '
{if isset($room['selected_services']) && $room['selected_services']}
{foreach $room['selected_services'] as $service}
-
+
{if isset($specificPriceModificationForm)}
{/if}
+ {if isset($num_hotel_amenities) && $num_hotel_amenities}
+
{/if}
- {if isset($num_global_demands) && $num_global_demands}
-
diff --git a/classes/BoOrder.php b/classes/BoOrder.php
index f08c766f6..adc4d423a 100644
--- a/classes/BoOrder.php
+++ b/classes/BoOrder.php
@@ -32,5 +32,6 @@ class BoOrder extends PaymentModule
$this->validateOrderAmount = false;
// Default payment type for backoffice order should be PAY_AT_HOTEL
$this->payment_type = OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL;
+ $this->idBookingSource = Source::getIdByCode('WALKIN');
}
}
\ No newline at end of file
diff --git a/classes/BusinessSource.php b/classes/BusinessSource.php
new file mode 100644
index 000000000..d9d072ed5
--- /dev/null
+++ b/classes/BusinessSource.php
@@ -0,0 +1,239 @@
+ 'business_source',
+ 'primary' => 'id_business_source',
+ 'multilang' => true,
+ 'fields' => array(
+ 'code' => array('type' => self::TYPE_STRING, 'validate' => 'isModuleName', 'required' => true, 'size' => 64),
+ 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'unremovable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ ),
+ );
+
+ public function add($autodate = true, $nullValues = false)
+ {
+ if ($this->position <= 0) {
+ $this->position = BusinessSource::getHigherPosition() + 1;
+ }
+
+ return parent::add($autodate, $nullValues);
+ }
+
+ public function update($nullValues = false)
+ {
+ if (!$this->active && $this->hasUnremovableSource()) {
+ return false;
+ }
+
+ $result = parent::update($nullValues);
+
+ if ($result && !$this->active) {
+ $this->disableSources();
+ }
+
+ return $result;
+ }
+
+ public function disableSources()
+ {
+ return (bool)Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'source` SET `active` = 0
+ WHERE `id_business_source` = '.(int)$this->id.' AND `deleted` = 0'
+ );
+ }
+
+ public static function getHigherPosition()
+ {
+ $position = Db::getInstance()->getValue(
+ 'SELECT MAX(`position`) FROM `'._DB_PREFIX_.'business_source` WHERE `deleted` = 0'
+ );
+
+ return is_numeric($position) ? (int)$position : -1;
+ }
+
+ public function updatePosition($way, $position)
+ {
+ if (!$res = Db::getInstance()->executeS('
+ SELECT `position`, `id_business_source`
+ FROM `'._DB_PREFIX_.'business_source`
+ WHERE `deleted` = 0
+ ORDER BY `position` ASC'
+ )) {
+ return false;
+ }
+
+ $moved_item = null;
+ foreach ($res as $row) {
+ if ((int)$row['id_business_source'] == (int)$this->id) {
+ $moved_item = $row;
+ }
+ }
+
+ if (!$moved_item) {
+ return false;
+ }
+
+ return (Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = `position` '.($way ? '- 1' : '+ 1').'
+ WHERE `deleted` = 0 AND `position`
+ '.($way
+ ? '> '.(int)$moved_item['position'].' AND `position` <= '.(int)$position
+ : '< '.(int)$moved_item['position'].' AND `position` >= '.(int)$position)
+ ) && Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = '.(int)$position.'
+ WHERE `id_business_source` = '.(int)$moved_item['id_business_source']));
+ }
+
+ public static function cleanPositions()
+ {
+ $return = true;
+
+ $result = Db::getInstance()->executeS('
+ SELECT `id_business_source`
+ FROM `'._DB_PREFIX_.'business_source`
+ WHERE `deleted` = 0
+ ORDER BY `position` ASC'
+ );
+
+ $i = 0;
+ foreach ($result as $row) {
+ $return = Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = '.(int)$i++.'
+ WHERE `id_business_source` = '.(int)$row['id_business_source']
+ ) && $return;
+ }
+
+ return $return;
+ }
+
+ public static function codeExists($code, $idExclude = 0)
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT `id_business_source` FROM `'._DB_PREFIX_.'business_source`
+ WHERE `code` = \''.pSQL($code).'\' AND `id_business_source` != '.(int)$idExclude
+ );
+ }
+
+ public static function getUnremovableIds()
+ {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT `id_business_source` FROM `'._DB_PREFIX_.'business_source` WHERE `unremovable` = 1 AND `deleted` = 0'
+ );
+
+ return array_map('intval', array_column($rows, 'id_business_source'));
+ }
+
+ public static function getActiveList($idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT bs.`id_business_source`, bsl.`name`
+ FROM `'._DB_PREFIX_.'business_source` bs
+ LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl
+ ON (bsl.`id_business_source` = bs.`id_business_source` AND bsl.`id_lang` = '.(int)$idLang.')
+ WHERE bs.`deleted` = 0
+ ORDER BY bs.`position` ASC
+ ');
+ }
+
+ public function isRemovable()
+ {
+ return !$this->unremovable;
+ }
+
+ public function hasUnremovableSource()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$this->id.' AND `unremovable` = 1 AND `deleted` = 0'
+ );
+ }
+
+ public function hasSourceUsedByOrder()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source` s
+ INNER JOIN `'._DB_PREFIX_.'orders` o ON o.`id_source` = s.`id_source`
+ WHERE s.`id_business_source` = '.(int)$this->id
+ );
+ }
+
+ public function getOrderCount()
+ {
+ return (int)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source` s
+ INNER JOIN `'._DB_PREFIX_.'orders` o ON o.`id_source` = s.`id_source`
+ WHERE s.`id_business_source` = '.(int)$this->id
+ );
+ }
+
+ public function delete()
+ {
+ if (!$this->isRemovable()) {
+ return false;
+ }
+
+ $keepSoft = $this->hasSourceUsedByOrder();
+
+ $sources = Db::getInstance()->executeS(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source` WHERE `id_business_source` = '.(int)$this->id.' AND `deleted` = 0'
+ );
+ foreach ($sources as $row) {
+ $objSource = new Source((int)$row['id_source']);
+ if (!$objSource->delete()) {
+ return false;
+ }
+ }
+
+ if ($keepSoft) {
+ $this->deleted = 1;
+ if (!$this->update()) {
+ return false;
+ }
+ } elseif (!parent::delete()) {
+ return false;
+ }
+
+ return BusinessSource::cleanPositions();
+ }
+}
diff --git a/classes/Cart.php b/classes/Cart.php
index 96fe2c68c..6e7e282fd 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -186,7 +186,8 @@ class CartCore extends ObjectModel
const ONLY_ROOM_SERVICES_WITH_AUTO_ADD_WITHOUT_CONVENIENCE_FEE = 17;
const ONLY_CONVENIENCE_FEE = 18;
- const ONLY_PRODUCTS_WITH_DEMANDS = 19;
+ const ONLY_TOURISM_TAX = 19;
+ const ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE = 20;
public function __construct($id = null, $id_lang = null)
{
@@ -368,8 +369,8 @@ class CartCore extends ObjectModel
*/
public function getAverageProductsTaxRate(&$cart_amount_te = null, &$cart_amount_ti = null)
{
- $cart_amount_ti = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
- $cart_amount_te = $this->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount_ti = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
+ $cart_amount_te = $this->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
$cart_vat_amount = $cart_amount_ti - $cart_amount_te;
@@ -1548,7 +1549,7 @@ class CartCore extends ObjectModel
$compute_precision = $configuration->get('_PS_PRICE_COMPUTE_PRECISION_');
if (!$this->id) {
- return 0;
+ return $type == Cart::ONLY_TOURISM_TAX ? array('tourism_tax' => 0.0, 'tourism_tax_room' => 0.0, 'tourism_tax_service' => 0.0, 'tourism_tax_standalone_products' => 0.0, 'tourism_tax_convenience_fee' => 0.0) : 0;
}
$type = (int)$type;
@@ -1570,7 +1571,8 @@ class CartCore extends ObjectModel
Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING,
Cart::ADVANCE_PAYMENT,
Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS,
- Cart::ONLY_PRODUCTS_WITH_DEMANDS,
+ Cart::ONLY_TOURISM_TAX,
+ Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE,
);
// Define virtual context to prevent case where the cart is not the in the global context
@@ -1637,7 +1639,11 @@ class CartCore extends ObjectModel
}
$products_total = array();
$ecotax_total = 0;
- $totalDemandsPrice = 0;
+ $tourism_tax_total = 0.0;
+ $tourism_tax_room = 0.0;
+ $tourism_tax_service = 0.0;
+ $tourism_tax_standalone_products = 0.0;
+ $tourism_tax_convenience_fee = 0.0;
$objCartBookingData = new HotelCartBookingData();
$objServiceProductCartDetail = new ServiceProductCartDetail();
$objAdvPayment = new HotelAdvancedPayment();
@@ -1773,6 +1779,11 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $lineTotal;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $servicePorduct['tourism_tax'];
+ $tourism_tax_standalone_products += $servicePorduct['tourism_tax'];
+ }
}
}
@@ -1826,6 +1837,11 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $priceAdd;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $servicePorduct['tourism_tax'];
+ $tourism_tax_standalone_products += $servicePorduct['tourism_tax'];
+ }
}
}
} else if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']) {
@@ -1855,6 +1871,17 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $servicePrice;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $service['tourism_tax'];
+ if ($product['auto_add_to_cart'] && Product::PRICE_ADDITION_TYPE_INDEPENDENT == $product['price_addition_type']) {
+ $tourism_tax_convenience_fee += $service['tourism_tax'];
+ } elseif ($product['auto_add_to_cart'] && Product::PRICE_ADDITION_TYPE_WITH_ROOM == $product['price_addition_type']) {
+ $tourism_tax_room += $service['tourism_tax'];
+ } else {
+ $tourism_tax_service += $service['tourism_tax'];
+ }
+ }
}
}
}
@@ -1864,8 +1891,6 @@ class CartCore extends ObjectModel
$priceDisplay = Group::getPriceDisplayMethod(Group::getCurrent()->id);
if ($type == Cart::ADVANCE_PAYMENT || $type == Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS) {
- // getProductMinAdvPaymentAmountByIdCart already aggregates all rooms for this product internally,
- // so call it once and add once — not inside the per-room loop.
$advProductPrice = $objAdvPayment->getProductMinAdvPaymentAmountByIdCart(
$this->id,
$product['id_product'],
@@ -1911,18 +1936,49 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += Tools::processPriceRounding($totalPriceByProduct);
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ if ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $cartRoomInfo['id_product'])) {
+ $roomAddress = new Address((int) HotelRoomType::getHotelIdAddressByIdProduct($cartRoomInfo['id_product']));
+ $hotelBranch = new HotelBranchInformation((int) $roomAddress->id_hotel);
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($cartRoomInfo['date_from'], $cartRoomInfo['date_to']));
+ $unitPriceTe = (float) $roomTotalPrice['total_price_tax_excl'] / $numNights;
+ $childAges = !empty($occupancy[0]['child_ages']) ? (array) $occupancy[0]['child_ages'] : array();
+ $roomTaxCalculator = TaxManagerFactory::getManager($roomAddress, $idTourismTaxRulesGroup)->getTaxCalculator();
+ $roomTourismTax = $roomTaxCalculator->getTaxesTotalAmount(
+ $unitPriceTe,
+ $cartRoomInfo['date_from'],
+ $numNights,
+ $occupancy[0]['adults'],
+ $childAges,
+ (int) $hotelBranch->tourism_tax_collection_type,
+ 1,
+ (int) $this->id_currency
+ );
+ $tourism_tax_total += $roomTourismTax;
+ $tourism_tax_room += $roomTourismTax;
+ }
+ }
}
}
}
-
- // price of extra demands on room type in the cart
- $totalDemandsPrice += $objCartBookingData->getCartExtraDemands($this->id, $product['id_product'], 0, 0, 0, 1, 0, (int)$with_taxes);
}
+
+ if ($type == Cart::ONLY_TOURISM_TAX) {
+ return array(
+ 'tourism_tax' => $tourism_tax_total,
+ 'tourism_tax_room' => $tourism_tax_room,
+ 'tourism_tax_service' => $tourism_tax_service,
+ 'tourism_tax_standalone_products' => $tourism_tax_standalone_products,
+ 'tourism_tax_convenience_fee' => $tourism_tax_convenience_fee,
+ );
+ }
+
foreach ($products_total as $key => $price) {
$order_total += $price;
}
- $order_total_products = $order_total + $totalDemandsPrice;
+ $order_total_products = $order_total;
if ($type == Cart::ONLY_DISCOUNTS) {
$order_total = 0;
@@ -1941,15 +1997,6 @@ class CartCore extends ObjectModel
return $wrapping_fees;
}
- // price of extra demands on room type in the cart
- if ($type == Cart::BOTH
- || $type == Cart::BOTH_WITHOUT_SHIPPING
- || $type == Cart::ADVANCE_PAYMENT
- || $type == Cart::ONLY_PRODUCTS_WITH_DEMANDS
- ) {
- $order_total += $totalDemandsPrice;
- }
-
$order_total_discount = 0;
$order_shipping_discount = 0;
$advance_payment_products_discount = 0;
@@ -1964,7 +2011,7 @@ class CartCore extends ObjectModel
Cart::ONLY_ROOM_SERVICES_WITHOUT_AUTO_ADD,
Cart::ONLY_ROOM_SERVICES_WITHOUT_CONVENIENCE_FEE,
Cart::ONLY_ROOM_SERVICES_WITH_AUTO_ADD_WITHOUT_CONVENIENCE_FEE,
- Cart::ONLY_PRODUCTS_WITH_DEMANDS)
+ Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE)
) && CartRule::isFeatureActive()
) {
// First, retrieve the cart rules associated to this "getOrderTotal"
@@ -2052,6 +2099,10 @@ class CartCore extends ObjectModel
$order_total += $shipping_fees + $wrapping_fees;
}
+ if ($tourism_tax_total > 0) {
+ $order_total += $tourism_tax_total;
+ }
+
if ($order_total < 0 && $type != Cart::ONLY_DISCOUNTS) {
return 0;
}
@@ -3163,8 +3214,17 @@ class CartCore extends ObjectModel
}
}
} elseif ($sellingPreferenceType == Product::SELLING_PREFERENCE_STANDALONE) {
- if (isset($id_customer)) {
- $id_address = (int)Address::getFirstCustomerAddressId($id_customer);
+ $addressPreferenceType = Configuration::get('PS_STANDARD_PRODUCT_ORDER_ADDRESS_PREFRENCE');
+ if ($addressPreferenceType == Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_CUSTOM) {
+ $id_address = (int) Configuration::get('PS_STANDARD_PRODUCT_ORDER_ADDRESS_ID');
+ } elseif ($addressPreferenceType != Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_HOTEL) {
+ $customer = Context::getContext()->customer;
+ if (Validate::isLoadedObject($customer) && ($idCustomerAddress = Address::getFirstCustomerAddressId($customer->id))) {
+ $id_address = $idCustomerAddress;
+ }
+ }
+ if (!$id_address && ($htlAddress = HotelBranchInformation::getAddress(Configuration::get('WK_PRIMARY_HOTEL')))) {
+ $id_address = $htlAddress['id_address'];
}
}
}
@@ -3827,26 +3887,6 @@ class CartCore extends ObjectModel
$total_discounts = $this->getOrderTotal(true, Cart::ONLY_DISCOUNTS);
$total_discounts_tax_exc = $this->getOrderTotal(false, Cart::ONLY_DISCOUNTS);
$objCartBookingData = new HotelCartBookingData();
- $total_demands_wt = $objCartBookingData->getCartExtraDemands(
- $this->id,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1
- );
- $total_demands = $objCartBookingData->getCartExtraDemands(
- $this->id,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 0
- );
// The cart content is altered for display
foreach ($cart_rules as &$cart_rule) {
// If the cart rule is automatic (wihtout any code) and include free shipping, it should not be displayed as a cart rule but only set the shipping cost to 0
@@ -3932,9 +3972,41 @@ class CartCore extends ObjectModel
}
}
+ $totalRoomsCount = 0;
+ if ($htlCartData = HotelCartBookingData::getHotelCartBookingData(0)) {
+ foreach ($htlCartData as $roomTypeCart) {
+ $totalRoomsCount += $roomTypeCart['total_num_rooms'];
+ }
+ }
+ $nbTotalProducts = 0;
+ $objServiceProductCartDetail = new ServiceProductCartDetail();
+ foreach ($products as &$product) {
+ if (!$product['booking_product']) {
+ if (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
+ $nbTotalProducts += (int) $product['cart_quantity'];
+ } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+ || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+ ) {
+ if ($serviceProducts = $objServiceProductCartDetail->getServiceProductsInCart(
+ $this->id,
+ [Product::SELLING_PREFERENCE_HOTEL_STANDALONE, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE],
+ null,
+ 0,
+ null,
+ $product['id_product']
+ )) {
+ foreach ($serviceProducts as $serviceProduct) {
+ if ($serviceProduct['id_hotel'] && $serviceProduct['id_product'] == $product['id_product']) {
+ $nbTotalProducts += (int) $serviceProduct['quantity'];
+ }
+ }
+ }
+ }
+ }
+ }
$objHotelAdvancedPayment = new HotelAdvancedPayment();
- $total_rooms_with_services_without_discount_te = $total_rooms + $total_demands + $total_additional_services + $total_additional_services_auto_add + $total_standalone_service_products;
- $total_rooms_with_services_without_discount_ti = $total_rooms_wt + $total_demands_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt + $total_standalone_service_products_wt;
+ $total_rooms_with_services_without_discount_te = $total_rooms + $total_additional_services + $total_additional_services_auto_add + $total_standalone_service_products;
+ $total_rooms_with_services_without_discount_ti = $total_rooms_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt + $total_standalone_service_products_wt;
$cart_total_without_discount_te = $total_rooms_with_services_without_discount_te + $convenience_fee;
$cart_total_without_discount_ti = $total_rooms_with_services_without_discount_ti + $convenience_fee_wt;
@@ -3943,6 +4015,23 @@ class CartCore extends ObjectModel
$total_tax_without_discount = 0;
}
+ $tourismTaxTotals = $this->getOrderTotal(true, Cart::ONLY_TOURISM_TAX);
+ $tourism_tax = $tourismTaxTotals['tourism_tax'];
+ $tourism_tax_convenience_fee = $tourismTaxTotals['tourism_tax_convenience_fee'];
+ $tourism_tax_service = $tourismTaxTotals['tourism_tax_service'];
+ $tourism_tax_room = $tourismTaxTotals['tourism_tax_room'];
+ $tourism_tax_standalone_products = $tourismTaxTotals['tourism_tax_standalone_products'];
+
+ $roomGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_room) ? $tourism_tax_room : 0.0;
+ $serviceGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_service) ? $tourism_tax_service : 0.0;
+ $standaloneProductsGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_standalone_products) ? $tourism_tax_standalone_products : 0.0;
+ $convenienceFeeGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_convenience_fee) ? $tourism_tax_convenience_fee : 0.0;
+ $total_rooms_wt += $roomGrossUpAmount;
+ $total_additional_services_wt += $serviceGrossUpAmount;
+ $total_standalone_service_products_wt += $standaloneProductsGrossUpAmount;
+ $convenience_fee_wt += $convenienceFeeGrossUpAmount;
+ $total_rooms_with_services_without_discount_ti += $roomGrossUpAmount + $serviceGrossUpAmount + $standaloneProductsGrossUpAmount + $convenienceFeeGrossUpAmount;
+
$summary = array(
'delivery' => $delivery,
'delivery_state' => State::getNameById($delivery->id_state),
@@ -3972,8 +4061,6 @@ class CartCore extends ObjectModel
'convenience_fee_tax' => $convenience_fee_tax,
'total_standalone_service_products_wt' => $total_standalone_service_products_wt,
'total_standalone_service_products' => $total_standalone_service_products,
- 'total_extra_demands_wt' => $total_demands_wt,
- 'total_extra_demands' => $total_demands,
'total_price' => $base_total_tax_inc,
'total_tax' => $total_tax,
'total_price_without_tax' => $base_total_tax_exc,
@@ -3988,7 +4075,11 @@ class CartCore extends ObjectModel
'total_rooms_with_services_without_discount_ti' => $total_rooms_with_services_without_discount_ti,
'cart_total_without_discount_te' => $cart_total_without_discount_te,
'cart_total_without_discount_ti' => $cart_total_without_discount_ti,
- 'total_tax_without_discount' => $total_tax_without_discount
+ 'total_tax_without_discount' => $total_tax_without_discount,
+ 'tourism_tax' => max(0.0, (float) $tourism_tax),
+ 'total_tourism_tax' => max(0.0, (float) $tourism_tax),
+ 'tourism_tax_grossed_up' => TaxConfiguration::isGrossedUp($tourism_tax),
+ 'total_products_in_cart' => $totalRoomsCount + $nbTotalProducts,
);
$hook = Hook::exec('actionCartSummary', $summary, null, true);
if (is_array($hook)) {
@@ -4907,20 +4998,11 @@ class CartCore extends ObjectModel
$idCustomer = $objCart->id_customer;
$idCurrency = $objCart->id_currency;
- $extraDemands = null;
-
// We have to check the alreadt entered rooms for booking parameters with this variable as Also is sending all the rooms everytime
// because id_guest is not managed in the API call
$roomsAddedToCart = [];
foreach ($bookingRows as $booking) {
$booking = json_decode(json_encode($booking, true), true);
- if (isset($booking['extra_demands']['extra_demand'])) {
- $extraDemands = $booking['extra_demands']['extra_demand'];
- if (isset($extraDemands['id_global_demand'])) {
- $extraDemands = array($extraDemands);
- }
- $extraDemands = json_encode($extraDemands);
- }
// get room booking info
$idProduct = $booking['id_product'];
@@ -5027,7 +5109,6 @@ class CartCore extends ObjectModel
$objCartBooking->id_hotel = $val_hotel_room_info['id_hotel'];
$objCartBooking->booking_type = HotelBookingDetail::ALLOTMENT_AUTO;
$objCartBooking->quantity = $numDays;
- $objCartBooking->extra_demands = $extraDemands;
$objCartBooking->date_from = $dateFrom;
$objCartBooking->date_to = $dateTo;
$objCartBooking->save();
diff --git a/classes/CartRule.php b/classes/CartRule.php
index b2ca7172a..6f25aeabf 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1018,8 +1018,8 @@ class CartRuleCore extends ObjectModel
$all_cart_rules_ids = $context->cart->getOrderedCartRulesIds();
- $cart_amount_ti = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
- $cart_amount_te = $context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount_ti = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
+ $cart_amount_te = $context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
// Free shipping on selected carriers
if ($this->free_shipping && in_array($filter, array(CartRule::FILTER_ACTION_ALL, CartRule::FILTER_ACTION_ALL_NOCAP, CartRule::FILTER_ACTION_SHIPPING))) {
@@ -1045,7 +1045,7 @@ class CartRuleCore extends ObjectModel
// Discount (%) on the whole order
if ($this->reduction_percent && $this->reduction_product == 0) {
// Do not give a reduction on free products!
- $order_total = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS, $package_products);
+ $order_total = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, $package_products);
foreach ($context->cart->getCartRules(CartRule::FILTER_ACTION_GIFT) as $cart_rule) {
$order_total -= Tools::ps_round($cart_rule['obj']->getContextualValue($use_tax, $context, CartRule::FILTER_ACTION_GIFT, $package), _PS_PRICE_COMPUTE_PRECISION_);
}
@@ -1118,9 +1118,9 @@ class CartRuleCore extends ObjectModel
if ((float)$this->reduction_amount > 0) {
$prorata = 1;
if (!is_null($package) && count($all_products)) {
- $total_products = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $total_products = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
if ($total_products) {
- $prorata = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS, $package['products']) / $total_products;
+ $prorata = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, $package['products']) / $total_products;
}
}
@@ -1169,7 +1169,7 @@ class CartRuleCore extends ObjectModel
if ($this->reduction_tax == $use_tax) {
// The reduction cannot exceed the products total, except when we do not want it to be limited (for the partial use calculation)
if ($filter != CartRule::FILTER_ACTION_ALL_NOCAP) {
- $cart_amount = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
$reduction_amount = min($reduction_amount, $cart_amount);
}
$reduction_value += $prorata * $reduction_amount;
@@ -1467,7 +1467,7 @@ class CartRuleCore extends ObjectModel
return array();
}
- $order_total = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS, null, null, false);
+ $order_total = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, null, null, false);
static $errors = array();
foreach ($context->cart->getCartRules() as $cart_rule) {
if ($error = $cart_rule['obj']->checkValidity($context, true)) {
diff --git a/classes/Customer.php b/classes/Customer.php
index d5644633b..752fd9605 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -41,6 +41,9 @@ class CustomerCore extends ObjectModel
/** @var int Gender ID */
public $id_gender = 0;
+ /** @var int Nationality, stored as a country ID */
+ public $id_country = 0;
+
/** @var int Default group ID */
public $id_default_group;
@@ -170,6 +173,7 @@ class CustomerCore extends ObjectModel
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'required' => true, 'size' => 60),
'last_passwd_gen' => array('type' => self::TYPE_STRING, 'copy_post' => false),
'id_gender' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_country' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'birthday' => array('type' => self::TYPE_DATE, 'validate' => 'isBirthDate'),
'newsletter' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'newsletter_date_add' => array('type' => self::TYPE_DATE,'copy_post' => false),
@@ -209,6 +213,10 @@ class CustomerCore extends ObjectModel
if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) {
self::$definition['fields']['phone']['required'] = true;
}
+
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY')) {
+ self::$definition['fields']['id_country']['required'] = true;
+ }
}
public function validateFields($die = true, $error_return = false)
@@ -830,6 +838,16 @@ class CustomerCore extends ObjectModel
return (int) Configuration::get('PS_COUNTRY_DEFAULT');
}
+ public static function getNationalities($id_lang)
+ {
+ $nationalities = Country::getCountries((int) $id_lang);
+ $nationalities[-1] = array(
+ 'id_country' => -1,
+ 'name' => Translate::getAdminTranslation('Other', 'AdminCustomers'),
+ );
+
+ return $nationalities;
+ }
public function toggleStatus()
{
diff --git a/classes/Language.php b/classes/Language.php
index af5923fca..e4a61b0a4 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -26,6 +26,9 @@
class LanguageCore extends ObjectModel
{
+ const EMAIL_TEMPLATE_TYPE_CORE = 1;
+ const EMAIL_TEMPLATE_TYPE_MODULE = 2;
+
public $id;
/** @var string Name */
@@ -1065,4 +1068,69 @@ class LanguageCore extends ObjectModel
}
}
}
-}
+
+ public static function resetEmailTemplate($mail_template_name, $iso, $template_type, $module_name = false, $theme = '')
+ {
+ $is_module_template = ($template_type === self::EMAIL_TEMPLATE_TYPE_MODULE);
+
+ if ($theme) {
+ $dest_dir = $is_module_template
+ ? _PS_ROOT_DIR_.'/themes/'.$theme.'/modules/'.$module_name.'/mails/'.$iso.'/'
+ : _PS_ROOT_DIR_.'/themes/'.$theme.'/mails/'.$iso.'/';
+ } else {
+ $dest_dir = $is_module_template
+ ? rtrim(_PS_MODULE_DIR_, '/').'/'.$module_name.'/mails/'.$iso.'/'
+ : _PS_MAIL_DIR_.$iso.'/';
+ }
+
+ // Reuse the already-downloaded language pack if we have one, only hit the API when it's missing
+ $gzip_file = _PS_TRANSLATIONS_DIR_.$iso.'.gzip';
+ if (!file_exists($gzip_file)) {
+ Language::downloadAndInstallLanguagePack($iso, null, null, false);
+ }
+ if (!file_exists($gzip_file)) {
+ return array('hasError' => true, 'error' => Tools::displayError('Could not download the language pack from the QloApps API. Please check your internet connection and try again.'));
+ }
+
+ require_once(_PS_TOOL_DIR_.'tar/Tar.php');
+ $gz = new Archive_Tar($gzip_file, true);
+ if ($gz->error_object) {
+ return array('hasError' => true, 'error' => Tools::displayError('The downloaded language pack is corrupted. Please try again.'));
+ }
+ $archive_dir = $is_module_template
+ ? 'modules/'.$module_name.'/mails/'.$iso.'/'
+ : 'mails/'.$iso.'/';
+
+ $mail_dir = $is_module_template
+ ? rtrim(_PS_MODULE_DIR_, '/').'/'.$module_name.'/mails/'
+ : _PS_MAIL_DIR_;
+
+ $content = array('html' => null, 'txt' => null);
+ foreach (array_keys($content) as $ext) {
+ $file_content = $gz->extractInString($archive_dir.$mail_template_name.'.'.$ext);
+ if ($file_content === null) {
+ if (file_exists($mail_dir.$iso.'/'.$mail_template_name.'.'.$ext)) {
+ $file_content = file_get_contents($mail_dir.$iso.'/'.$mail_template_name.'.'.$ext);
+ } elseif (file_exists($mail_dir.'en/'.$mail_template_name.'.'.$ext)) {
+ $file_content = file_get_contents($mail_dir.'en/'.$mail_template_name.'.'.$ext);
+ }
+ }
+ if ($file_content !== null) {
+ if (file_put_contents($dest_dir.$mail_template_name.'.'.$ext, $file_content) === false) {
+ return array('hasError' => true, 'error' => sprintf(Tools::displayError('Could not write file "%s".'), $dest_dir.$mail_template_name.'.'.$ext));
+ }
+ $content[$ext] = $file_content;
+ }
+ }
+
+ if ($content['html'] === null && $content['txt'] === null) {
+ return array('hasError' => true, 'error' => Tools::displayError('This template was not found in the downloaded language pack.'));
+ }
+
+ return array(
+ 'hasError' => false,
+ 'html' => $content['html'],
+ 'txt' => $content['txt'],
+ );
+ }
+}
\ No newline at end of file
diff --git a/classes/Media.php b/classes/Media.php
index 58feb76d8..ab9ea2574 100644
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -45,9 +45,9 @@ class MediaCore
'ui.tabs' => array('fileName' => 'jquery.ui.tabs.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
'ui.datepicker' => array('fileName' => 'jquery.ui.datepicker.min.js', 'dependencies' => array('ui.core'), 'theme' => true),
'ui.progressbar' => array('fileName' => 'jquery.ui.progressbar.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
- 'ui.tooltip' => array('fileName' => 'jquery.ui.tooltip.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.position','effects.core'), 'theme' => true),
- 'ui.accordion' => array('fileName' => 'jquery.ui.accordion.min.js', 'dependencies' => array('ui.core', 'ui.widget','effects.core'), 'theme' => true),
- 'effects.core' => array('fileName' => 'jquery.effects.core.min.js', 'dependencies' => array(), 'theme' => false),
+ 'ui.tooltip' => array('fileName' => 'jquery.ui.tooltip.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.position','ui.effect'), 'theme' => true),
+ 'ui.accordion' => array('fileName' => 'jquery.ui.accordion.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.effect'), 'theme' => true),
+ 'ui.effect' => array('fileName' => 'jquery.ui.effect.min.js', 'dependencies' => array(), 'theme' => false),
'effects.blind' => array('fileName' => 'jquery.effects.blind.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
'effects.bounce' => array('fileName' => 'jquery.effects.bounce.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
'effects.clip' => array('fileName' => 'jquery.effects.clip.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 1f7df631f..bd9da789c 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -357,6 +357,13 @@ abstract class PaymentModuleCore extends Module
$order->source = Configuration::get('PS_SHOP_DOMAIN');
}
+ // Booking Source (business categorization, e.g. Direct Website/Walk-in/OTA) —
+ if (isset($this->idBookingSource) && $this->idBookingSource) {
+ $order->id_source = (int)$this->idBookingSource;
+ } else {
+ $order->id_source = (int)Source::getDefaultSourceId();
+ }
+
if (self::DEBUG_MODE) {
PrestaShopLogger::addLog('PaymentModule::validateOrder - Order is about to be added', 1, null, 'Cart', (int)$id_cart, true);
}
@@ -510,6 +517,7 @@ abstract class PaymentModuleCore extends Module
$objMail = new Mail();
$objServiceProductCartDetail = new ServiceProductCartDetail();
$cart_rules = $this->context->cart->getCartRules();
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
foreach ($order_detail_list as $key => $order_detail) {
/** @var OrderDetail $order_detail */
@@ -913,64 +921,37 @@ abstract class PaymentModuleCore extends Module
);
}
}
- if ($objBookingDetail->save()) {
- // save extra demands info
- if ($objCartBookingData->extra_demands
- && ($extraDemands = json_decode($objCartBookingData->extra_demands, true))
- ) {
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($extraDemands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $objBookingDetail->id;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
- $objBookingDemand->unit_price_tax_excl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 0
- );
- $objBookingDemand->unit_price_tax_incl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 1
- );
+ if (!$objBookingDetail->save()) {
+ PrestaShopLogger::addLog('PaymentModule::validateOrder - Cannot save Booking Detail', 3, null, 'Cart', (int)$id_cart, true);
+ throw new PrestaShopException('Can\'t save Booking Detail');
+ }
- $numDays = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- }
+ OrderTaxDetail::updateVatScoping((int) $id_order_detail, (int) $objBookingDetail->id, 0);
- $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $numDays;
- $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $numDays;
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $hotelTaxContext = TaxConfiguration::resolveHotelAddressAndCollectionType($objCartBookingData->id_hotel, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ $numNights = max(1, HotelHelper::getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to));
+ $numAdults = (int) $objCartBookingData->adults;
+ $childAges = !empty($objCartBookingData->child_ages) ? (array) json_decode($objCartBookingData->child_ages, true) : array();
+ $unitPriceTaxExcl = (float) $total_price['total_price_tax_excl'] / $numNights;
- $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
- );
- $taxCalc = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalc->computation_method;
- if ($objBookingDemand->save()) {
- $objBookingDemand->tax_calculator = $taxCalc;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
- }
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $hotelTaxContext['address'],
+ $unitPriceTaxExcl,
+ $objBookingDetail->date_from,
+ $numNights,
+ $numAdults,
+ $childAges,
+ (int) $this->context->cart->id_currency,
+ $hotelTaxContext['collectionType'],
+ (int) $idLang,
+ 1,
+ $order->id,
+ (int) $id_order_detail,
+ $objBookingDetail->id,
+ 0
+ );
}
}
} else {
@@ -1013,7 +994,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->name = $product['name'];
$objServiceProductOrderDetail->quantity = $roomTypeService['quantity'];
$objServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($roomBookingDetail['id_hotel'], $roomBookingDetail['id'], new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
} elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']) {
@@ -1046,7 +1050,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->hotel_name = $objHotelBranch->hotel_name;
}
$objServiceProductOrderDetail->quantity = $hotelProduct['quantity'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($product['id_hotel'], 0, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
@@ -1074,7 +1101,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->name = $standaloneProduct['name'];
$objServiceProductOrderDetail->option_name = $standaloneProduct['option_name'];
$objServiceProductOrderDetail->quantity = $standaloneProduct['quantity'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(0, 0, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
@@ -1131,7 +1181,32 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->id_htl_booking_detail = $roomBookingDetail['id'];
$objServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
}
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ $idHotel = $serviceProduct['id_hotel'] ? $serviceProduct['id_hotel'] : (isset($roomBookingDetail['id_hotel']) ? (int) $roomBookingDetail['id_hotel'] : 0);
+ $idHtlBookingDetail = $serviceProduct['id_hotel'] ? 0 : (isset($roomBookingDetail['id']) ? (int) $roomBookingDetail['id'] : 0);
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($idHotel, $idHtlBookingDetail, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
}
@@ -1237,8 +1312,8 @@ abstract class PaymentModuleCore extends Module
$cart_booking_data_text = $this->getEmailTemplateContent('hotel_booking_cart_data_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
$cart_booking_data_html = $this->getEmailTemplateContent('hotel_booking_cart_data.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
- $extra_demands_details_html = $this->getEmailTemplateContent('booking_extra_demands.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
- $extra_demands_details_text = $this->getEmailTemplateContent('booking_extra_demands_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
+ $extra_services_details_html = $this->getEmailTemplateContent('booking_extra_services.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
+ $extra_services_details_text = $this->getEmailTemplateContent('booking_extra_services_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
$normal_products_data_html = $this->getEmailTemplateContent('service_product_data.tpl', Mail::TYPE_HTML, $orderServiceProducts);
$normal_products_data_txt = $this->getEmailTemplateContent('service_product_data_text.tpl', Mail::TYPE_TEXT, $orderServiceProducts);
@@ -1250,8 +1325,8 @@ abstract class PaymentModuleCore extends Module
$room_tax = ($room_price_tax_incl - $room_price_tax_excl);
// extra services
- $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_te']);
- $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
+ $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0));
+ $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0));
$additional_service_tax = ($additional_service_price_tax_incl - $additional_service_price_tax_excl);
// convenience fee price
@@ -1267,7 +1342,8 @@ abstract class PaymentModuleCore extends Module
$service_products_tax = ($standalone_products_price_tax_incl + $hotel_standalone_products_price_tax_incl) - ($standalone_products_price_tax_excl + $hotel_standalone_products_price_tax_excl);
- $total_order_tax = $room_tax + $additional_service_tax + $total_convenience_fee_tax + $service_products_tax;
+ $totalTourismTax = OrderTaxDetail::getOrderTourismTaxTotal((int) $order->id);
+ $total_order_tax = max(0, $room_tax + $additional_service_tax + $total_convenience_fee_tax + $service_products_tax - $totalTourismTax);
$total_products = Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? $order->total_products : $order->total_products_wt, $this->context->currency, false);
@@ -1293,6 +1369,8 @@ abstract class PaymentModuleCore extends Module
),
'service_products_tax' => Tools::displayPrice($service_products_tax, $this->context->currency, false),
'total_order_tax' => Tools::displayPrice($total_order_tax, $this->context->currency, false),
+ 'total_tourism_tax' => Tools::displayPrice($totalTourismTax, $this->context->currency, false),
+ 'has_tourism_tax' => $totalTourismTax > 0,
'total_paid' => Tools::displayPrice($order->total_paid, $this->context->currency, false),
'total_products' => Tools::displayPrice($total_products, $this->context->currency, false),
'total_discounts' => Tools::displayPrice(-$order->total_discounts, $this->context->currency, false),
@@ -1311,22 +1389,12 @@ abstract class PaymentModuleCore extends Module
$data = array(
'{cart_booking_data_html}' => $cart_booking_data_html,
'{cart_booking_data_text}' => $cart_booking_data_text,
- '{extra_demands_details_html}' => $extra_demands_details_html,
- '{extra_demands_details_text}' => $extra_demands_details_text,
+ '{extra_services_details_html}' => $extra_services_details_html,
+ '{extra_services_details_text}' => $extra_services_details_text,
'{normal_products_data_html}' => $normal_products_data_html,
'{normal_products_data_txt}' => $normal_products_data_txt,
'{order_total_info_html}' => $order_total_info_html,
'{order_total_info_txt}' => $order_total_info_txt,
- '{total_extra_demands_te}' => Tools::displayPrice(
- $cart_booking_data['total_extra_demands_te'],
- $this->context->currency,
- false
- ),
- '{extra_demands_tax}' => Tools::displayPrice(
- ($cart_booking_data['total_extra_demands_ti']-$cart_booking_data['total_extra_demands_te']),
- $this->context->currency,
- false
- ),
'{delivery_company}' => $delivery->company,
'{delivery_firstname}' => $delivery->firstname,
'{delivery_lastname}' => $delivery->lastname,
@@ -1895,10 +1963,7 @@ abstract class PaymentModuleCore extends Module
$obj_cart_bk_data = new HotelCartBookingData();
$obj_htl_bk_dtl = new HotelBookingDetail();
$obj_rm_type = new HotelRoomType();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
- $result['total_extra_demands_te'] = 0;
- $result['total_extra_demands_ti'] = 0;
$cart_htl_data = array();
if (!empty($products)) {
foreach ($products as $type_key => $type_value) {
@@ -1972,35 +2037,6 @@ abstract class PaymentModuleCore extends Module
$cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children'];
- // extra demands prices
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1
- );
-
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order->id,
0,
@@ -2046,9 +2082,6 @@ abstract class PaymentModuleCore extends Module
$cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = ($cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = ($data_v['total_price_tax_incl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = ($data_v['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']);
-
- $result['total_extra_demands_te'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'];
- $result['total_extra_demands_ti'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'];
}
}
// calculate averages now
diff --git a/classes/Product.php b/classes/Product.php
index 101829007..f09b83c20 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -226,6 +226,9 @@ class ProductCore extends ObjectModel
public $id_tax_rules_group = 1;
+ /** @var int Tourism tax rules group id (0 = no tourism tax) */
+ public $id_tourism_tax_rules_group = 0;
+
/**
* We keep this variable for retrocompatibility for themes
* @deprecated 1.5.0
@@ -313,8 +316,9 @@ class ProductCore extends ObjectModel
/* Shop fields */
'id_category_default' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
- 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
- 'on_sale' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
+ 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
+ 'id_tourism_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
+ 'on_sale' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
'online_only' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
'ecotax' => array('type' => self::TYPE_FLOAT, 'shop' => true, 'validate' => 'isPrice'),
'minimal_quantity' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedInt'),
@@ -469,14 +473,6 @@ class ProductCore extends ObjectModel
'id' => array('required' => true),
)
),
- 'extra_demands' => array(
- 'resource' => 'extra_demand',
- 'fields' => array(
- 'id' => array('required' => true),
- 'id_option' => array(),
- 'price' => array(),
- )
- ),
'services' => array(
'resource' => 'service',
'fields' => array(
@@ -5426,6 +5422,31 @@ class ProductCore extends ObjectModel
return Cache::retrieve($key);
}
+ /**
+ * Returns the tourism tax rules group assigned to a product, mirroring
+ * getIdTaxRulesGroupByIdProduct() for tourism tax's own product_shop column.
+ *
+ * @param int $id_product
+ * @param Context|null $context
+ * @return int
+ */
+ public static function getIdTourismTaxRulesGroupByIdProduct($id_product, ?Context $context = null)
+ {
+ if (!$context) {
+ $context = Context::getContext();
+ }
+ $key = 'product_id_tourism_tax_rules_group_'.(int)$id_product.'_'.(int)$context->shop->id;
+ if (!Cache::isStored($key)) {
+ $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_tourism_tax_rules_group`
+ FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_product` = '.(int)$id_product.' AND id_shop='.(int)$context->shop->id);
+ Cache::store($key, (int)$result);
+ return (int)$result;
+ }
+ return Cache::retrieve($key);
+ }
+
/**
* Returns tax rate.
*
@@ -6627,35 +6648,6 @@ class ProductCore extends ObjectModel
);
}
- public function getWsExtraDemands()
- {
- $objHotelRoomTypeDemand = new HotelRoomTypeDemand();
- $selectedDemands = Db::getInstance()->executeS(
- 'SELECT `id_global_demand` as `id` FROM `'._DB_PREFIX_.'htl_room_type_demand`
- WHERE `id_product` = '.(int)$this->id
- );
- $res = array();
- $demands = $objHotelRoomTypeDemand->getRoomTypeDemands($this->id);
- if ($selectedDemands) {
- foreach ($selectedDemands as $id_demand => $demand) {
- $option['id'] = $demand['id'];
- if (isset($demands[$demand['id']]['adv_option']) && count($demands[$demand['id']]['adv_option'])) {
- foreach ($demands[$demand['id']]['adv_option'] as $id_option => $adv_option) {
- $option['id_option'] = $id_option;
- $option['price'] = $adv_option['price_tax_excl'];
- $res[] = $option;
- }
- } else {
- $option['id_option'] = false;
- $option['price'] = $demand['price_tax_excl'];
- $res[] = $option;
- }
- }
- }
-
- return $res;
- }
-
public function getWsServices()
{
return Db::getInstance()->executeS(
@@ -6718,59 +6710,6 @@ class ProductCore extends ObjectModel
return $this->delete();
}
- public function setWsExtraDemands($demands)
- {
- Db::getInstance()->execute('
- DELETE FROM `'._DB_PREFIX_.'htl_room_type_demand`
- WHERE `id_product` = '.(int)$this->id
- );
- Db::getInstance()->execute('
- DELETE FROM `'._DB_PREFIX_.'htl_room_type_demand_price`
- WHERE `id_product` = '.(int)$this->id
- );
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- $savedDemands = array();
- foreach ($demands as $globalDemand) {
- if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($globalDemand['id']))) {
- if (!isset($savedDemands[$globalDemand['id']])) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $this->id;
- $objRoomTypeDemand->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemand->save();
- $savedDemands[$globalDemand['id']] = $objRoomTypeDemand->id;
- }
-
- if (isset($globalDemand['price'])) {
- if ($objAdvOption->getGlobalDemandAdvanceOptions($objGlobalDemand->id)
- && isset($globalDemand['id_option'])
- && Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($globalDemand['id_option']))
- ) {
- if ($globalDemand['price'] != $objAdvOption->price) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $this->id;
- $objRoomTypeDemandPrice->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemandPrice->id_option = $objAdvOption->id;
- $objRoomTypeDemandPrice->price = $globalDemand['price'];
- $objRoomTypeDemandPrice->save();
- }
- } else {
- // save selected demands prices for this room type
- if ($objGlobalDemand->price != $globalDemand['price']) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $this->id;
- $objRoomTypeDemandPrice->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemandPrice->id_option = 0;
- $objRoomTypeDemandPrice->price = $globalDemand['price'];
- $objRoomTypeDemandPrice->save();
- }
- }
- }
- }
- }
-
- return true;
- }
-
public function setWsServices($services)
{
Db::getInstance()->execute('
@@ -6833,21 +6772,24 @@ class ProductCore extends ObjectModel
$idAddress = null,
$useReduc = 1,
$idGroup = null,
- $idCartBooking = 0
+ $idCartBooking = 0,
+ $includeTourismTax = false,
+ $numAdults = null,
+ $childrenAges = null
) {
if ($useTax === null) {
$useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
}
$price = Product::getPriceStatic(
- (int)$idProduct,
+ $idProduct,
$useTax,
$idProductOption,
6,
null,
false,
$useReduc,
- (int)$quantity,
+ $quantity,
false,
null,
$idCart,
@@ -6857,8 +6799,8 @@ class ProductCore extends ObjectModel
true,
null,
true,
- (int)$idHotel,
- (int)$idProductRoomType,
+ $idHotel,
+ $idProductRoomType,
$idGroup,
$idCartBooking
);
@@ -6879,22 +6821,56 @@ class ProductCore extends ObjectModel
)
);
- if (Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY
- && $dateFrom && $dateTo
- ) {
+ $isPerDay = Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY
+ && $dateFrom && $dateTo;
+ if ($isPerDay) {
$price = $price * HotelHelper::getNumberOfDays($dateFrom, $dateTo);
}
- $price = $price * (int)$quantity;
+ $price = $price * $quantity;
- if (!$specificPrice || ($specificPrice['id_cart'] == 0 && $specificPrice['id_htl_cart_booking'] == 0)) {
- if (!$idGroup || !Validate::isLoadedObject(new Group((int)$idGroup))) {
- $idGroup = (int)Group::getCurrent()->id;
+ $tourismTaxHotelId = $idHotel;
+ if (!$tourismTaxHotelId && $idProductRoomType) {
+ $objRoomType = new HotelRoomType();
+ if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProductRoomType)) {
+ $tourismTaxHotelId = $roomTypeInfo['id_hotel'];
}
- $price = Product::applyGroupDiscount($price, $idProduct, $idGroup);
}
+
+ if ($includeTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $priceCalcNumDays = $isPerDay ? HotelHelper::getNumberOfDays($dateFrom, $dateTo) : 1;
+ $unitPriceExcl = ($useTax ? Product::getServiceProductPrice($idProduct, $idProductOption, $idHotel, $idProductRoomType, false, 1, $dateFrom, $dateTo, $idCart, $idAddress, $useReduc, $idGroup, $idCartBooking) : $price / (int) $quantity) / $priceCalcNumDays;
+
+ $fallbackAddress = new Address(Cart::getIdAddressForTaxCalculation($idProduct));
+ if ($numAdults === null) {
+ $taxContext = TaxConfiguration::resolveServiceLineTaxContext($tourismTaxHotelId, 0, $fallbackAddress, $idCartBooking);
+ } else {
+ // caller supplied its own occupancy (e.g. a live search form) — use it as-is, only resolve address/collection type
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($tourismTaxHotelId, $fallbackAddress);
+ $taxContext = array(
+ 'address' => $hotelContext['address'],
+ 'collectionType' => $hotelContext['collectionType'],
+ 'checkInDate' => $dateFrom,
+ 'numNights' => max(1, HotelHelper::getNumberOfDays($dateFrom, $dateTo)),
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges ?: array(),
+ );
+ }
+
+ // no $idCurrency passed — TaxCalculator::getTaxesAmount() already resolves it from the current context when null
+ $taxCalculator = TaxManagerFactory::getManager($taxContext['address'], $idTourismTaxRulesGroup)->getTaxCalculator();
+ $price += $taxCalculator->getTaxesTotalAmount(
+ $unitPriceExcl,
+ $taxContext['checkInDate'],
+ $taxContext['numNights'],
+ $taxContext['numAdults'],
+ $taxContext['childrenAges'],
+ $taxContext['collectionType'],
+ $quantity
+ );
+ }
+
return $price;
-
}
/**
diff --git a/classes/Source.php b/classes/Source.php
new file mode 100644
index 000000000..4f453e96b
--- /dev/null
+++ b/classes/Source.php
@@ -0,0 +1,241 @@
+ 'source',
+ 'primary' => 'id_source',
+ 'multilang' => true,
+ 'fields' => array(
+ 'id_business_source' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'code' => array('type' => self::TYPE_STRING, 'validate' => 'isModuleName', 'required' => true, 'size' => 64),
+ 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'unremovable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ ),
+ );
+
+ public function add($autodate = true, $nullValues = false)
+ {
+ if ($this->position <= 0) {
+ $this->position = Source::getHigherPosition($this->id_business_source) + 1;
+ }
+
+ return parent::add($autodate, $nullValues);
+ }
+
+ public static function getHigherPosition($idBusinessSource)
+ {
+ $position = Db::getInstance()->getValue(
+ 'SELECT MAX(`position`) FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$idBusinessSource.' AND `deleted` = 0'
+ );
+
+ return is_numeric($position) ? (int)$position : -1;
+ }
+
+ public function updatePosition($way, $position)
+ {
+ if (!$res = Db::getInstance()->executeS('
+ SELECT `position`, `id_source`
+ FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$this->id_business_source.' AND `deleted` = 0
+ ORDER BY `position` ASC'
+ )) {
+ return false;
+ }
+
+ $moved_item = null;
+ foreach ($res as $row) {
+ if ((int)$row['id_source'] == (int)$this->id) {
+ $moved_item = $row;
+ }
+ }
+
+ if (!$moved_item) {
+ return false;
+ }
+
+ return (Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = `position` '.($way ? '- 1' : '+ 1').'
+ WHERE `id_business_source` = '.(int)$this->id_business_source.' AND `deleted` = 0 AND `position`
+ '.($way
+ ? '> '.(int)$moved_item['position'].' AND `position` <= '.(int)$position
+ : '< '.(int)$moved_item['position'].' AND `position` >= '.(int)$position)
+ ) && Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = '.(int)$position.'
+ WHERE `id_source` = '.(int)$moved_item['id_source']));
+ }
+
+ public static function codeExists($code, $idExclude = 0)
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source`
+ WHERE `code` = \''.pSQL($code).'\' AND `id_source` != '.(int)$idExclude
+ );
+ }
+
+ public static function getIdByCode($code)
+ {
+ return (int)Db::getInstance()->getValue(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source`
+ WHERE `code` = \''.pSQL($code).'\' AND `deleted` = 0'
+ );
+ }
+
+ public static function getUnremovableIds()
+ {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source` WHERE `unremovable` = 1 AND `deleted` = 0'
+ );
+
+ return array_map('intval', array_column($rows, 'id_source'));
+ }
+
+ public static function getActiveSource($idBusinessSource, $idSource, $idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT a.`id_source`, al.`name`
+ FROM `'._DB_PREFIX_.'source` a
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` al ON (al.`id_source` = a.`id_source` AND al.`id_lang` = '.(int)$idLang.')
+ WHERE a.`id_business_source` = '.(int)$idBusinessSource.' AND a.`deleted` = 0 AND a.`id_source` NOT IN ('.(int)$idSource.') AND a.`active` = 1
+ ORDER BY a.`position` ASC
+ ');
+ }
+
+ public static function getAllSource($active = null, $idLang = null)
+ {
+ $idLang = $idLang ?: (int)Context::getContext()->language->id;
+
+ $where = ' WHERE a.`deleted` = 0';
+ if ($active !== null) {
+ $where .= ' AND a.`active` = '.(int)(bool)$active;
+ }
+
+ return Db::getInstance()->executeS('
+ SELECT a.`id_source`, a.`id_business_source`, a.`code`, al.`name`, bsl.`name` AS `business_source_name`
+ FROM `'._DB_PREFIX_.'source` a
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` al ON (al.`id_source` = a.`id_source` AND al.`id_lang` = '.(int)$idLang.')
+ LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl ON (bsl.`id_business_source` = a.`id_business_source` AND bsl.`id_lang` = '.(int)$idLang.')
+ '.$where.'
+ ORDER BY a.`id_business_source` ASC, a.`position` ASC
+ ');
+ }
+
+ public static function getSourcesUsedInOrders($idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT DISTINCT o.`id_source`, sl.`name`
+ FROM `'._DB_PREFIX_.'orders` o
+ INNER JOIN `'._DB_PREFIX_.'source` s ON (s.`id_source` = o.`id_source`)
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` sl ON (sl.`id_source` = s.`id_source` AND sl.`id_lang` = '.(int)$idLang.')
+ ');
+ }
+
+ public static function cleanPositions($idBusinessSource)
+ {
+ $return = true;
+
+ $result = Db::getInstance()->executeS('
+ SELECT `id_source`
+ FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$idBusinessSource.' AND `deleted` = 0
+ ORDER BY `position` ASC'
+ );
+
+ $i = 0;
+ foreach ($result as $row) {
+ $return = Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = '.(int)$i++.'
+ WHERE `id_source` = '.(int)$row['id_source']
+ ) && $return;
+ }
+
+ return $return;
+ }
+
+ public function isRemovable()
+ {
+ return !$this->unremovable;
+ }
+
+ public function isUsedByOrder()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` WHERE `id_source` = '.(int)$this->id
+ );
+ }
+
+ public function mergeOrdersInto($idTargetSource)
+ {
+ return (bool)Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'orders` SET `id_source` = '.(int)$idTargetSource.' WHERE `id_source` = '.(int)$this->id
+ );
+ }
+
+ public static function getTotalOrderCount()
+ {
+ return (int)Db::getInstance()->getValue('SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders`');
+ }
+
+ public function delete()
+ {
+ if (!$this->isRemovable()) {
+ return false;
+ }
+
+ if ($this->isUsedByOrder()) {
+ $this->deleted = 1;
+ if (!$this->update()) {
+ return false;
+ }
+ } elseif (!parent::delete()) {
+ return false;
+ }
+
+ return Source::cleanPositions($this->id_business_source);
+ }
+
+ public static function getDefaultSourceId()
+ {
+ return (int)Configuration::get('PS_DEFAULT_BOOKING_SOURCE');
+ }
+}
diff --git a/classes/Translate.php b/classes/Translate.php
index 7fac82462..8da0d39c5 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -255,8 +255,10 @@ class TranslateCore
$i18n_file = $override_i18n_file;
}
- if (!include($i18n_file)) {
- Tools::displayError(sprintf('Cannot include PDF translation language file : %s', $i18n_file));
+ if (file_exists($i18n_file)) {
+ if (!include($i18n_file)) {
+ Tools::displayError(sprintf('Cannot include PDF translation language file : %s', $i18n_file));
+ }
}
if (!isset($_LANGPDF) || !is_array($_LANGPDF)) {
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 5252400ca..782f01f4a 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -660,11 +660,11 @@ class FrontControllerCore extends Controller
}
/**
- * Renders and outputs maintenance page and ends controller process.
+ * Redirects a cursed request (e.g. an invalid/expired access token) to page not found and ends controller process.
*/
public function initCursedPage()
{
- $this->displayMaintenancePage();
+ Tools::redirect($this->context->link->getPageLink('pagenotfound'));
}
/**
diff --git a/classes/helper/HelperKpiRow.php b/classes/helper/HelperKpiRow.php
index f47022bf7..b10bce643 100644
--- a/classes/helper/HelperKpiRow.php
+++ b/classes/helper/HelperKpiRow.php
@@ -44,7 +44,7 @@ class HelperKpiRowCore extends Helper
if (isset($this->context->cookie->$cookieKey)) {
$kpi->visible = (bool) $this->context->cookie->$cookieKey;
} else {
- $kpi->visible = true;
+ $kpi->visible = isset($kpi->visible) ? (bool) $kpi->visible : true;
}
$countVisible = $kpi->visible ? ++$countVisible : $countVisible;
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 6c7b33e11..b1097b0e2 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -271,6 +271,7 @@ class OrderCore extends ObjectModel
'invoice_date' => array('type' => self::TYPE_DATE),
'delivery_date' => array('type' => self::TYPE_DATE),
'source' => array('type' => self::TYPE_STRING),
+ 'id_source' => array('type' => self::TYPE_INT),
'valid' => array('type' => self::TYPE_BOOL),
'reference' => array('type' => self::TYPE_STRING),
'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0),
@@ -1161,16 +1162,25 @@ class OrderCore extends ObjectModel
$selling_preference_type = null,
$product_auto_add = null,
$product_price_addition_type = null,
- $ids_order_detail = []
+ $ids_order_detail = [],
+ $includeTourismTax = true
) {
/* Retro-compatibility (now set directly on the validateOrder() method) */
if (!$products) {
$products = $this->getProductsDetail($bookingProducts, $selling_preference_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
}
+ $tourismTaxByOrderDetail = array();
+ if (!$includeTourismTax && $products) {
+ $tourismTaxByOrderDetail = OrderTaxDetail::getAmountsByOrderDetail((int) $this->id);
+ }
+
$return = 0;
foreach ($products as $row) {
$return += $row['total_price_tax_incl'];
+ if (!$includeTourismTax) {
+ $return -= isset($tourismTaxByOrderDetail[$row['id_order_detail']]) ? $tourismTaxByOrderDetail[$row['id_order_detail']] : 0;
+ }
}
return $return;
@@ -1821,10 +1831,11 @@ class OrderCore extends ObjectModel
// 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
+ FROM `'._DB_PREFIX_.'order_tax_detail` odt
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
WHERE od.`id_order` = '.(int)$this->id.'
- AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD
+ AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)'
);
}
@@ -2152,61 +2163,6 @@ class OrderCore extends ObjectModel
return $this->update();
}
- /**
- * Returns the correct product taxes breakdown.
- *
- * @since 1.5.0.1
- * @return array
- */
- public function getProductTaxesBreakdown()
- {
- $tmp_tax_infos = array();
- if ($this->useOneAfterAnotherTaxComputationMethod()) {
- // sum by taxes
- $taxes_by_tax = Db::getInstance()->executeS('
- SELECT odt.`id_order_detail`, t.`name`, t.`rate`, SUM(`total_amount`) AS `total_amount`
- FROM `'._DB_PREFIX_.'order_detail_tax` odt
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
- LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
- WHERE od.`id_order` = '.(int)$this->id.'
- GROUP BY odt.`id_tax`
- ');
-
- // format response
- $tmp_tax_infos = array();
- foreach ($taxes_by_tax as $tax_infos) {
- $tmp_tax_infos[$tax_infos['rate']]['total_amount'] = $tax_infos['tax_amount'];
- $tmp_tax_infos[$tax_infos['rate']]['name'] = $tax_infos['name'];
- }
- } else {
- // sum by order details in order to retrieve real taxes rate
- $taxes_infos = Db::getInstance()->executeS('
- SELECT odt.`id_order_detail`, t.`rate` AS `name`, SUM(od.`total_price_tax_excl`) AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`
- FROM `'._DB_PREFIX_.'order_detail_tax` odt
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
- LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
- WHERE od.`id_order` = '.(int)$this->id.'
- GROUP BY odt.`id_order_detail`
- ');
-
- // sum by taxes
- $tmp_tax_infos = array();
- foreach ($taxes_infos as $tax_infos) {
- if (!isset($tmp_tax_infos[$tax_infos['rate']])) {
- $tmp_tax_infos[$tax_infos['rate']] = array('total_amount' => 0,
- 'name' => 0,
- 'total_price_tax_excl' => 0);
- }
-
- $tmp_tax_infos[$tax_infos['rate']]['total_amount'] += $tax_infos['total_amount'];
- $tmp_tax_infos[$tax_infos['rate']]['name'] = $tax_infos['name'];
- $tmp_tax_infos[$tax_infos['rate']]['total_price_tax_excl'] += $tax_infos['total_price_tax_excl'];
- }
- }
-
- return $tmp_tax_infos;
- }
-
/**
* Returns the shipping taxes breakdown
*
@@ -2538,7 +2494,7 @@ class OrderCore extends ObjectModel
} else {
$order_details = $this->getOrderDetailList();
}
- $expected_total_tax = (float)$this->getTotalProductsWithTaxes($limitToOrderDetails) - (float)$this->getTotalProductsWithoutTaxes($limitToOrderDetails);
+ $expected_total_tax = (float)$this->getTotalProductsWithTaxes($limitToOrderDetails, null, null, null, null, [], false) - (float)$this->getTotalProductsWithoutTaxes($limitToOrderDetails);
$order_ecotax_tax = 0;
@@ -3157,15 +3113,11 @@ class OrderCore extends ObjectModel
$totalRoomsAndServices = $this->getTotalProductsWithoutTaxes();
}
- // Get total of extra demands
- $objBookingDemand = new HotelBookingDemands();
- $totalExtraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands($this->id, 0, 0, 0, 0, 0, 1, $useTax);
-
// Get cart rules total
$orderTotalDiscount = $this->getCartRulesTotal($useTax);
// Update order with new amounts after removing cart rule
- $totalOrder = ($totalExtraDemands + $totalRoomsAndServices) - $orderTotalDiscount;
+ $totalOrder = $totalRoomsAndServices - $orderTotalDiscount;
$totalOrder = $totalOrder > 0 ? $totalOrder : 0;
return $totalOrder;
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index cce75207a..2275f7811 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -218,7 +218,7 @@ class OrderDetailCore extends ObjectModel
'tax_computation_method' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'ecotax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
- 'ecotax_tax_rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
+ 'ecotax_tax_rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
'discount_quantity_applied' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'download_hash' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'),
'download_nb' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
@@ -292,7 +292,11 @@ class OrderDetailCore extends ObjectModel
return false;
}
- Db::getInstance()->delete('order_detail_tax', 'id_order_detail='.(int)$this->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$this->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
return $res;
}
@@ -345,15 +349,23 @@ class OrderDetailCore extends ObjectModel
public static function getTaxCalculatorStatic($id_order_detail)
{
$sql = 'SELECT t.*, d.`tax_computation_method`
- FROM `'._DB_PREFIX_.'order_detail_tax` t
+ FROM `'._DB_PREFIX_.'order_tax_detail` t
LEFT JOIN `'._DB_PREFIX_.'order_detail` d ON (d.`id_order_detail` = t.`id_order_detail`)
- WHERE d.`id_order_detail` = '.(int)$id_order_detail;
+ WHERE d.`id_order_detail` = '.(int)$id_order_detail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = t.`id_tax` AND tc.`is_tourism_tax` = 1)';
$computation_method = 1;
$taxes = array();
+ $seenTaxIds = array();
if ($results = Db::getInstance()->executeS($sql)) {
foreach ($results as $result) {
- $taxes[] = new Tax((int)$result['id_tax']);
+ $idTax = (int) $result['id_tax'];
+ if (isset($seenTaxIds[$idTax])) {
+
+ continue;
+ }
+ $seenTaxIds[$idTax] = true;
+ $taxes[] = new Tax($idTax);
}
$computation_method = $result['tax_computation_method'];
@@ -449,26 +461,30 @@ class OrderDetailCore extends ObjectModel
0,
$taxGroupInfo['id_room_type'],
)) {
- $serviceProductData = array_shift($serviceProductData);
- $numDays = 1;
- if ((Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method)
- && (!$numDays = HotelHelper::getNumberOfDays($serviceProductData['date_from'], $serviceProductData['date_to']))
- ) {
- $numDays = 1;
+ $quantity = 0;
+ $totalPriceTaxExcl = 0.0;
+ $firstServiceProduct = null;
+ foreach ($serviceProductData as $bookingServiceData) {
+ $bookingNumDays = 1;
+ if (Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method) {
+ $bookingNumDays = HotelHelper::getNumberOfDays($bookingServiceData['date_from'], $bookingServiceData['date_to']) ?: 1;
+ }
+ foreach ($bookingServiceData['additional_services'] as $item) {
+ $itemQuantity = (isset($item['quantity']) ? $item['quantity'] : 0) * $bookingNumDays;
+ $quantity += $itemQuantity;
+ $totalPriceTaxExcl += $itemQuantity * (isset($item['unit_price_tax_excl']) ? $item['unit_price_tax_excl'] : 0);
+ if ($firstServiceProduct === null) {
+ $firstServiceProduct = $item;
+ }
+ }
}
- $quantity = array_reduce($serviceProductData['additional_services'], function ($totalQty, $item) {
- return $totalQty + (isset($item['quantity']) ? $item['quantity'] : 0);
- }, 0);
+ $unit_price_tax_excl = $quantity > 0 ? ($totalPriceTaxExcl / $quantity) : 0;
- $firstServiceProduct = array_shift($serviceProductData['additional_services']);
-
- $unit_price_tax_excl = isset($firstServiceProduct['unit_price_tax_excl']) ? $firstServiceProduct['unit_price_tax_excl'] : 0;
-
- $quantity = $quantity * $numDays;
-
- $tax_manager = TaxManagerFactory::getManager($this->vat_address, (int)$firstServiceProduct['id_tax_rules_group']);
- $this->tax_calculator = $tax_manager->getTaxCalculator();
+ if ($firstServiceProduct) {
+ $tax_manager = TaxManagerFactory::getManager($this->vat_address, (int)$firstServiceProduct['id_tax_rules_group']);
+ $this->tax_calculator = $tax_manager->getTaxCalculator();
+ }
} elseif ($serviceProductData = $objServiceProductCartDetail->getServiceProductsInCart(
$idCart,
array(),
@@ -477,22 +493,21 @@ class OrderDetailCore extends ObjectModel
$taxGroupInfo['id_room_type'],
$this->product_id
)) {
-
- $quantity = array_reduce($serviceProductData, function ($totalQty, $item) {
- return $totalQty + (isset($item['quantity']) ? $item['quantity'] : 0);
- }, 0);
-
- $serviceProductData = array_shift($serviceProductData);
- $unit_price_tax_excl = isset($serviceProductData['unit_price_tax_excl']) ? $serviceProductData['unit_price_tax_excl'] : 0;
-
- $numDays = 1;
- if ((Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method)
- && (!$numDays = HotelHelper::getNumberOfDays($serviceProductData['date_from'], $serviceProductData['date_to']))
- ) {
- $numDays = 1;
+ // Same sum-across-every-row fix as above, cart-side: don't let array_shift() collapse
+ // the representative unit price/day-count down to just the first cart row.
+ $quantity = 0;
+ $totalPriceTaxExcl = 0.0;
+ foreach ($serviceProductData as $cartServiceItem) {
+ $itemNumDays = 1;
+ if (Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method) {
+ $itemNumDays = HotelHelper::getNumberOfDays($cartServiceItem['date_from'], $cartServiceItem['date_to']) ?: 1;
+ }
+ $itemQuantity = (isset($cartServiceItem['quantity']) ? $cartServiceItem['quantity'] : 0) * $itemNumDays;
+ $quantity += $itemQuantity;
+ $totalPriceTaxExcl += $itemQuantity * (isset($cartServiceItem['unit_price_tax_excl']) ? $cartServiceItem['unit_price_tax_excl'] : 0);
}
- $quantity = $quantity * $numDays;
+ $unit_price_tax_excl = $quantity > 0 ? ($totalPriceTaxExcl / $quantity) : 0;
}
if ($this->tax_calculator == null) {
@@ -512,7 +527,7 @@ class OrderDetailCore extends ObjectModel
$total_amount = Tools::processPriceRounding($amount, $quantity, $order->round_type, $order->round_mode);
- $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.'),';
+ $values .= '('.(int)$order->id.','.(int)$this->id.',0,0,'.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.',NOW()),';
}
}
}
@@ -546,7 +561,7 @@ class OrderDetailCore extends ObjectModel
$total_amount = Tools::processPriceRounding($amount, $this->product_quantity, $order->round_type, $order->round_mode);
- $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.'),';
+ $values .= '('.(int)$order->id.','.(int)$this->id.',0,0,'.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.',NOW()),';
}
}
@@ -554,10 +569,15 @@ class OrderDetailCore extends ObjectModel
if ($values) {
if ($replace) {
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$this->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$this->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
}
- $sql = 'INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (id_order_detail, id_tax, unit_amount, total_amount)
+ $sql = 'INSERT INTO `'._DB_PREFIX_.'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
VALUES '.$values;
return Db::getInstance()->execute($sql);
@@ -573,7 +593,10 @@ class OrderDetailCore extends ObjectModel
$tax_manager = TaxManagerFactory::getManager($address, (int)Product::getIdTaxRulesGroupByIdProduct((int)$this->product_id, $this->context));
$this->tax_calculator = $tax_manager->getTaxCalculator();
- return $this->saveTaxCalculator($order, true);
+ $result = $this->saveTaxCalculator($order, true);
+ OrderTaxDetail::rescopeVatAfterReset((int) $this->id);
+
+ return $result;
}
/**
@@ -593,9 +616,25 @@ class OrderDetailCore extends ObjectModel
public static function getTaxListStatic($id_order_detail)
{
- $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_detail_tax`
- WHERE `id_order_detail` = '.(int)$id_order_detail;
- return Db::getInstance()->executeS($sql);
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_tax_detail` t
+ WHERE t.`id_order_detail` = '.(int)$id_order_detail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = t.`id_tax` AND tc.`is_tourism_tax` = 1)';
+ $rows = Db::getInstance()->executeS($sql);
+ if (!$rows) {
+ return $rows;
+ }
+
+ $seenTaxIds = array();
+ $deduped = array();
+ foreach ($rows as $row) {
+ if (isset($seenTaxIds[$row['id_tax']])) {
+ continue;
+ }
+ $seenTaxIds[$row['id_tax']] = true;
+ $deduped[] = $row;
+ }
+
+ return $deduped;
}
/*
@@ -729,6 +768,11 @@ class OrderDetailCore extends ObjectModel
$this->total_price_tax_incl = (float)$product['total_wt'];
$this->total_price_tax_excl = (float)$product['total'];
+ if (isset($this->tax_calculator) && Product::getIdTourismTaxRulesGroupByIdProduct((int) $product['id_product'])) {
+ $this->unit_price_tax_incl = $this->tax_calculator->addTaxes($this->unit_price_tax_excl);
+ $this->total_price_tax_incl = $this->tax_calculator->addTaxes($this->total_price_tax_excl);
+ }
+
$this->purchase_supplier_price = (float)$product['wholesale_price'];
if ($product['id_supplier'] > 0 && ($supplier_price = ProductSupplier::getProductPrice((int)$product['id_supplier'], $product['id_product'], $product['id_product_attribute'], true)) > 0) {
$this->purchase_supplier_price = (float)$supplier_price;
@@ -896,10 +940,11 @@ class OrderDetailCore extends ObjectModel
public function getWsTaxes()
{
$query = new DbQuery();
- $query->select('id_tax as id');
- $query->from('order_detail_tax', 'tax');
+ $query->select('tax.`id_tax` as id');
+ $query->from('order_tax_detail', 'tax');
$query->leftJoin('order_detail', 'od', 'tax.`id_order_detail` = od.`id_order_detail`');
$query->where('od.`id_order_detail` = '.(int)$this->id_order_detail);
+ $query->where('NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = tax.`id_tax` AND tc.`is_tourism_tax` = 1)');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
}
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 9d097b5d4..83ba35ce1 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -147,6 +147,28 @@ class OrderInvoiceCore extends ObjectModel
'.($this->id && $this->number ? ' AND od.`id_order_invoice` = '.(int)$this->id : '').' ORDER BY od.`product_name`');
}
+ /**
+ * Recompute this invoice's totals live from its own order_detail lines, instead of trusting
+ * accumulated deltas. Mirrors Order::getOrderTotal()'s formula, scoped to this invoice only.
+ *
+ * @return bool
+ */
+ public function recomputeTotalsFromLines()
+ {
+ $order = new Order((int) $this->id_order);
+ $invoiceProducts = $this->getProductsDetail();
+
+ $totalProductsTe = $order->getTotalProductsWithoutTaxes($invoiceProducts);
+ $totalProductsTi = $order->getTotalProductsWithTaxes($invoiceProducts);
+
+ $this->total_products = $totalProductsTe;
+ $this->total_products_wt = $totalProductsTi;
+ $this->total_paid_tax_excl = max(0, $totalProductsTe + $this->total_shipping_tax_excl + $this->total_wrapping_tax_excl - $this->total_discount_tax_excl);
+ $this->total_paid_tax_incl = max(0, $totalProductsTi + $this->total_shipping_tax_incl + $this->total_wrapping_tax_incl - $this->total_discount_tax_incl);
+
+ return $this->update();
+ }
+
public static function getInvoiceByNumber($id_invoice)
{
if (is_numeric($id_invoice)) {
@@ -323,11 +345,12 @@ class OrderInvoiceCore extends ObjectModel
// 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
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` 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)
+ AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD . '
+ AND NOT EXISTS (SELECT 1 FROM `' . _DB_PREFIX_ . 'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)')
|| Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
}
@@ -662,71 +685,6 @@ class OrderInvoiceCore extends ObjectModel
return $breakdown;
}
- public function getExtraDemandTaxesBreakdown($order = null)
- {
- if (!$order) {
- $order = $this->getOrder();
- }
- $breakdown = array();
- $order_details = $this->getProducts();
- $objBookingDemand = new HotelBookingDemands();
- $order_details = array_column($order_details, 'id_order_detail');
- $details = $objBookingDemand->getExtraDemandsTaxesDetails($order->id, $order_details);
- if (!$this->useOneAfterAnotherTaxComputationMethod()) {
- $grouped_details = array();
- foreach ($details as $row) {
- if (!isset($grouped_details[$row['id_htl_booking']][$row['id_booking_demand']])) {
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']] = array(
- 'tax_rate' => 0,
- 'total_tax_base' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- );
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['total_tax_base'] += $row['total_price_tax_excl'];
- }
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['total_amount'] += $row['total_amount'];
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['tax_rate'] += $row['rate'];
- }
- $details = $grouped_details;
- foreach ($details as $detail) {
- foreach ($detail as $row) {
- $rate = sprintf('%.3f', $row['tax_rate']);
- if (!isset($breakdown[$rate])) {
- $breakdown[$rate] = array(
- 'total_price_tax_excl' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- 'rate' =>$rate,
- );
- }
- $breakdown[$rate]['total_price_tax_excl'] += $row['total_tax_base'];
- $breakdown[$rate]['total_amount'] += $row['total_amount'];
- }
- }
- } else {
- foreach ($details as $row) {
- $key = $row['id_tax'];
- $rate = sprintf('%.3f', $row['rate']);
- if (!isset($breakdown[$key])) {
- $breakdown[$key] = array(
- 'total_price_tax_excl' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- 'rate' => $rate,
- );
- }
- $breakdown[$key]['total_price_tax_excl'] += $row['total_tax_base'];
- $breakdown[$key]['total_amount'] += $row['total_amount'];
- }
- }
- foreach ($breakdown as $rate => $data) {
- $breakdown[$rate]['total_price_tax_excl'] = Tools::ps_round($data['total_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_, $order->round_mode);
- $breakdown[$rate]['total_amount'] = Tools::ps_round($data['total_amount'], _PS_PRICE_COMPUTE_PRECISION_, $order->round_mode);
- }
-
- return $breakdown;
- }
-
/**
* Returns the shipping taxes breakdown
*
@@ -860,6 +818,28 @@ class OrderInvoiceCore extends ObjectModel
return $wrapping_breakdown;
}
+ /**
+ * Return tourism tax breakdown grouped by id_tax for invoice display. Collapsed into a single
+ * combined row when the invoice's tax breakdown display is off — same rule every other tax
+ * category (rooms, services, ...) already applies via useOneAfterAnotherTaxComputationMethod().
+ *
+ * @return array [['tax_name' => string, 'total_amount' => float], ...]
+ */
+ public function getTourismTaxBreakdown()
+ {
+ $breakdown = OrderTaxDetail::getBreakdownForInvoice((int) $this->id_order);
+ if (!$breakdown || $this->useOneAfterAnotherTaxComputationMethod()) {
+ return $breakdown;
+ }
+
+ $total = 0.0;
+ foreach ($breakdown as $row) {
+ $total += (float) $row['total_amount'];
+ }
+
+ return array(array('id_tax' => 0, 'tax_name' => '', 'total_amount' => $total));
+ }
+
/**
* Returns the ecotax taxes breakdown
*
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index 3da74d335..79785f982 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -203,7 +203,6 @@ class OrderReturnCore extends ObjectModel
}
$objOrder = new Order($idOrder);
- $objBookingDemands = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$calcServicePriceFirst = false;
@@ -211,6 +210,9 @@ class OrderReturnCore extends ObjectModel
$calcServicePriceFirst = true;
}
+ $appliedTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($idOrder, OrderTaxDetail::SCOPE_ROOM);
+ $appliedServiceTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($idOrder, OrderTaxDetail::SCOPE_SERVICE);
+
foreach ($returnDetails as $key => &$bookingRow) {
if ($skipReqCompletedNonRefunded) {
$objReturnState = new OrderReturnState($bookingRow['id_return_state']);
@@ -224,32 +226,9 @@ class OrderReturnCore extends ObjectModel
$bookingRow['extra_service_total_paid_amount'] = 0;
$bookingRow['extra_service_total_price_tax_incl'] = 0;
$bookingRow['room_paid_amount'] = 0;
+ $bookingRow['tourism_tax_applied_amount'] = 0;
+ $bookingRow['tourism_tax_paid_amount'] = 0;
- $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $bookingRow['id_product'],
- $bookingRow['id_room'],
- $bookingRow['date_from'],
- $bookingRow['date_to'],
- 0,
- 0,
- 1,
- $bookingRow['id']
- );
- if (count($roomSelectedDemands)) {
- foreach ($roomSelectedDemands as $demand) {
- if ($demand['total_price_tax_incl'] > 0) {
- if ($objOrder->total_paid_real > 0) {
- if ($calcServicePriceFirst) {
- $bookingRow['extra_service_total_paid_amount'] += $demand['total_price_tax_incl'];
- } else {
- $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/($objOrder->total_paid_tax_incl + $objOrder->total_discounts_tax_incl);
- }
- }
- $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl'];
- }
- }
- }
if ($roomSelectedServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -291,6 +270,12 @@ class OrderReturnCore extends ObjectModel
}
}
}
+ $bookingRow['tourism_tax_applied_amount'] = (isset($appliedTourismTaxByBooking[$bookingRow['id_htl_booking']]) ? (float) $appliedTourismTaxByBooking[$bookingRow['id_htl_booking']] : 0.0)
+ + (isset($appliedServiceTourismTaxByBooking[$bookingRow['id_htl_booking']]) ? (float) $appliedServiceTourismTaxByBooking[$bookingRow['id_htl_booking']] : 0.0);
+ if ($bookingRow['tourism_tax_applied_amount'] > 0 && $objOrder->total_paid_real > 0) {
+ $denominator = $objOrder->total_paid_tax_incl + $objOrder->total_discounts_tax_incl;
+ $bookingRow['tourism_tax_paid_amount'] = $denominator > 0 ? ($objOrder->total_paid_real * $bookingRow['tourism_tax_applied_amount'] / $denominator) : 0.0;
+ }
if ($customerView) {
$dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']);
if (isset($returnsCustView[$dateJoin]['num_rooms'])) {
diff --git a/classes/order/OrderTaxDetail.php b/classes/order/OrderTaxDetail.php
new file mode 100644
index 000000000..768c5c3ae
--- /dev/null
+++ b/classes/order/OrderTaxDetail.php
@@ -0,0 +1,1430 @@
+ 'order_tax_detail',
+ 'primary' => 'id_order_tax_detail',
+ 'fields' => array(
+ 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_htl_booking' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_service_product_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'unit_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'total_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ ),
+ );
+
+ /**
+ * Whether a booking's tourism tax (room + every attached service) is currently excluded from totals.
+ *
+ * @param int $idHtlBooking
+ * @return bool
+ */
+ public static function isBookingExempted($idHtlBooking)
+ {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT 1 FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = ' . (int) $idHtlBooking . '
+ AND `id_service_product_order_detail` = 0'
+ );
+ }
+
+ /**
+ * Whether a standalone (no room attachment) service line is currently excluded from totals.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @return bool
+ */
+ public static function isServiceLineExempted($idServiceProductOrderDetail)
+ {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT 1 FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = 0
+ AND `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ }
+
+ /**
+ * Delete the exemption marker for a booking or standalone service line — id_htl_booking=0 for the
+ * latter, id_service_product_order_detail=0 for the former (their own two-shape storage key).
+ * Kept as a shared helper since it's used 3 times (hardDeleteForBooking, applyBooking, applyServiceLine).
+ *
+ * @param int $idHtlBooking
+ * @param int $idServiceProductOrderDetail
+ * @return bool
+ */
+ protected static function deleteExemptionMarker($idHtlBooking, $idServiceProductOrderDetail)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = ' . (int) $idHtlBooking . '
+ AND `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax totals for every booking of an order, keyed by id_htl_booking — cached per order.
+ *
+ * @param int $idOrder
+ * @param int $scope self::SCOPE_ROOM (default) — float per room, keyed by id_htl_booking (room's own tax only)
+ * self::SCOPE_ROOM_STATUS — ['status' => int, 'total' => float] per room, same keys
+ * self::SCOPE_SERVICE — float per room, keyed by the attached room's id_htl_booking
+ * @return array keyed as described above per $scope
+ */
+ public static function getAppliedTourismTaxTotals($idOrder, $scope = self::SCOPE_ROOM)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getAppliedTourismTaxTotals-' . $idOrder . '-' . $scope;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = array();
+ if ($scope === self::SCOPE_SERVICE) {
+ $sql = 'SELECT spod.`id_htl_booking_detail`, SUM(tt.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ INNER JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = tt.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (spod.`id_htl_booking_detail` = 0 AND ex.`id_service_product_order_detail` = tt.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND spod.`id_htl_booking_detail` != 0
+ AND spod.`is_refunded` = 0
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY spod.`id_htl_booking_detail`';
+ $rows = Db::getInstance()->executeS($sql);
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_htl_booking_detail']] = (float) $row['total_amount'];
+ }
+ } else {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT tt.`id_htl_booking`,
+ SUM(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN tt.`total_amount` ELSE 0 END) AS total_amount,
+ MAX(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN 1 ELSE 0 END) AS applied_count
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = tt.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON ex.`id_htl_booking` = tt.`id_htl_booking`
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND tt.`id_htl_booking` != 0
+ AND hbd.`is_refunded` = 0
+ GROUP BY tt.`id_htl_booking`'
+ );
+ foreach ((array) $rows as $row) {
+ if ($scope === self::SCOPE_ROOM_STATUS) {
+ $result[(int) $row['id_htl_booking']] = array(
+ 'status' => ((int) $row['applied_count'] > 0) ? self::STATUS_APPLIED : self::STATUS_EXEMPTED,
+ 'total' => (float) $row['total_amount'],
+ );
+ } else {
+ $result[(int) $row['id_htl_booking']] = (float) $row['total_amount'];
+ }
+ }
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax status+total for every standalone (not attached
+ * to a room) service line of an order, keyed by id_service_product_order_detail — the service-line
+ * equivalent of getAppliedTourismTaxTotals(..., SCOPE_ROOM_STATUS), for lines with no room to fold
+ * their status into.
+ *
+ * @param int $idOrder
+ * @return array [id_service_product_order_detail => ['status' => int, 'total' => float]]
+ */
+ public static function getStandaloneServiceTourismTaxStatuses($idOrder)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getStandaloneServiceTourismTaxStatuses-' . $idOrder;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = array();
+ $rows = Db::getInstance()->executeS(
+ 'SELECT tt.`id_service_product_order_detail`,
+ SUM(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN tt.`total_amount` ELSE 0 END) AS total_amount,
+ MAX(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN 1 ELSE 0 END) AS applied_count
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ INNER JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = tt.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON ex.`id_service_product_order_detail` = tt.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND tt.`id_service_product_order_detail` != 0
+ AND spod.`id_htl_booking_detail` = 0
+ AND spod.`is_refunded` = 0
+ GROUP BY tt.`id_service_product_order_detail`'
+ );
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_service_product_order_detail']] = array(
+ 'status' => ((int) $row['applied_count'] > 0) ? self::STATUS_APPLIED : self::STATUS_EXEMPTED,
+ 'total' => (float) $row['total_amount'],
+ );
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Delete every row (VAT and tourism alike) for a scope — used only when the booking/service line
+ * itself is being permanently removed. Unlike the tourism-only delete in saveTourismTax() (which
+ * runs mid-lifecycle while VAT rows for the same scope still need to survive), this clears everything.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function deleteAllForScope($scopeColumn, $scopeValue)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'order_tax_detail`
+ WHERE `' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Same as deleteAllForScope(), but tourism tax only — VAT rows scoped to the same booking/service
+ * are left untouched. Used before a fresh recompute (re-applying after an exemption) so a changed
+ * tourism tax rule is picked up instead of restoring whatever was stored before the exemption.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function deleteTourismRowsForScope($scopeColumn, $scopeValue)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE otd FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking 0 for a service-line scope
+ * @param int $idServiceProductOrderDetail 0 for a room-booking scope
+ * @return bool
+ */
+ public static function updateVatScoping($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $idHtlBooking = (int) $idHtlBooking;
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $db = Db::getInstance();
+
+ $rawUnscopedRows = $db->executeS(
+ 'SELECT `id_order_tax_detail`, `id_order`, `id_tax`, `total_amount`
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail`
+ WHERE `id_order_detail` = ' . $idOrderDetail . '
+ AND `id_htl_booking` = 0
+ AND `id_service_product_order_detail` = 0'
+ );
+ if (!$rawUnscopedRows) {
+ return true;
+ }
+
+ $unscopedRows = array();
+ foreach ($rawUnscopedRows as $row) {
+ $idTax = (int) $row['id_tax'];
+ if (isset($unscopedRows[$idTax])) {
+ $unscopedRows[$idTax]['total_amount'] += (float) $row['total_amount'];
+ $db->delete('order_tax_detail', '`id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']);
+ continue;
+ }
+ $unscopedRows[$idTax] = $row;
+ $unscopedRows[$idTax]['total_amount'] = (float) $row['total_amount'];
+ }
+
+ if ($idHtlBooking) {
+ $ownPriceTaxExcl = (float) $db->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . $idHtlBooking
+ );
+ } elseif ($idServiceProductOrderDetail) {
+ $ownPriceTaxExcl = (float) $db->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . $idServiceProductOrderDetail
+ );
+ } else {
+ $ownPriceTaxExcl = 0.0;
+ }
+
+ $ownAmounts = OrderDetail::getTaxCalculatorStatic($idOrderDetail)->getTaxesAmount($ownPriceTaxExcl);
+
+ $result = true;
+ foreach ($unscopedRows as $row) {
+ $idTax = (int) $row['id_tax'];
+ $remaining = (float) $row['total_amount'];
+ $claimed = min($remaining, Tools::ps_round(isset($ownAmounts[$idTax]) ? (float) $ownAmounts[$idTax] : 0.0, 6));
+ $remaining = Tools::ps_round($remaining - $claimed, 6);
+
+ $result = $db->execute(
+ 'INSERT INTO `' . _DB_PREFIX_ . 'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
+ VALUES (' . (int) $row['id_order'] . ', ' . $idOrderDetail . ', ' . (int) $idHtlBooking . ', '
+ . (int) $idServiceProductOrderDetail . ', ' . $idTax . ', ' . $claimed . ', '
+ . $claimed . ', NOW())'
+ ) && $result;
+
+ if ($remaining <= 0.000001) {
+ $result = $db->delete('order_tax_detail', '`id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']) && $result;
+ } else {
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_tax_detail`
+ SET `total_amount` = ' . $remaining . '
+ WHERE `id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']
+ ) && $result;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @return bool
+ */
+ public static function rescopeVatAfterReset($idOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $db = Db::getInstance();
+ $result = true;
+
+ $roomIds = $db->executeS(
+ 'SELECT `id` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($roomIds as $row) {
+ $result = self::updateVatScoping($idOrderDetail, (int) $row['id'], 0) && $result;
+ }
+
+ $serviceIds = $db->executeS(
+ 'SELECT `id_service_product_order_detail` FROM `' . _DB_PREFIX_ . 'service_product_order_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($serviceIds as $row) {
+ $result = self::updateVatScoping($idOrderDetail, 0, (int) $row['id_service_product_order_detail']) && $result;
+ }
+
+ if ($roomIds || $serviceIds) {
+ $result = self::recomputeInclusivePrice($idOrderDetail, 0, 0) && $result;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Hard-delete every tax row — VAT and tourism alike — for a booking and its attached service
+ * lines (room removed from an already-placed order), plus the exemption marker if one exists.
+ *
+ * @param int $idHtlBooking
+ * @param int[] $serviceLineIds ServiceProductOrderDetail ids attached to this booking
+ * @return void
+ */
+ public static function hardDeleteForBooking($idHtlBooking, array $serviceLineIds)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ self::deleteAllForScope(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ foreach ($serviceLineIds as $idServiceLine) {
+ self::deleteAllForScope(self::SCOPE_COLUMN_SERVICE, (int) $idServiceLine);
+ }
+ self::deleteExemptionMarker($idHtlBooking, 0);
+ }
+
+ /**
+ * Sum of total_amount for a booking/service-line scope (every row counts — exemption is never
+ * stored on the row itself, it's derived from marker existence at read time).
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return float
+ */
+ protected static function getScopedTotal($scopeColumn, $scopeValue)
+ {
+ return (float) Db::getInstance()->getValue(
+ 'SELECT COALESCE(SUM(otd.`total_amount`), 0)
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Whether tourism tax has never been computed for this scope — no rows exist yet, and none were
+ * ever refunded either. True means a fresh compute (buildRoomTaxParams()/buildServiceLineTaxParams()
+ * + saveTourismTaxFromParams()) is needed instead of restoring/reusing existing rows.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function hasNeverBeenComputed($scopeColumn, $scopeValue)
+ {
+ if (self::hasRefundedRowsForScope($scopeColumn, $scopeValue)) {
+ return false;
+ }
+
+ return !(bool) Db::getInstance()->getValue(
+ 'SELECT otd.`id_order_tax_detail` FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Whether a scope's tax is currently excluded from totals — resolves a service line to its parent
+ * room's marker when attached, its own marker when standalone. Used by saveTourismTax() to decide
+ * whether a freshly (re)computed amount should move the denormalized display totals.
+ *
+ * @param int $idHtlBooking 0 for a service-line scope
+ * @param int $idServiceProductOrderDetail 0 for a room-booking scope
+ * @return bool
+ */
+ protected static function isScopeExempted($idHtlBooking, $idServiceProductOrderDetail)
+ {
+ if ($idHtlBooking) {
+ return self::isBookingExempted($idHtlBooking);
+ }
+ if ($idServiceProductOrderDetail) {
+ $serviceLine = new ServiceProductOrderDetail((int) $idServiceProductOrderDetail);
+ if (Validate::isLoadedObject($serviceLine) && $serviceLine->id_htl_booking_detail) {
+ return self::isBookingExempted((int) $serviceLine->id_htl_booking_detail);
+ }
+ return self::isServiceLineExempted($idServiceProductOrderDetail);
+ }
+ return false;
+ }
+
+ /**
+ * Compute and save tourism tax for one room-booking or service-product line.
+ * @param int $idTaxRulesGroup Tourism TRG assigned to the product
+ * @param Address $address Jurisdiction address (the hotel's own, not the customer's)
+ * @param float $unitPriceTaxExcl Room/service unit_price_tax_excl (% base and tier lookup)
+ * @param string $checkInDate 'YYYY-MM-DD'
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges Ages at check-in date
+ * @param int $idCurrency
+ * @param int $collectionType HotelBranchInformation::tourism_tax_collection_type snapshot
+ * @param int $idLang
+ * @param int $quantity Line quantity multiplier. Rooms: always 1.
+ * @param int $idOrder
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking 0 for service lines
+ * @param int $idServiceProductOrderDetail 0 for room bookings
+ * @return void
+ */
+ public static function saveTourismTax(
+ $idTaxRulesGroup,
+ Address $address,
+ $unitPriceTaxExcl,
+ $checkInDate,
+ $numNights,
+ $numAdults,
+ array $childrenAges,
+ $idCurrency,
+ $collectionType,
+ $idLang,
+ $quantity,
+ $idOrder,
+ $idOrderDetail,
+ $idHtlBooking,
+ $idServiceProductOrderDetail
+ ) {
+ $idTaxRulesGroup = (int) $idTaxRulesGroup;
+ $idOrderDetail = (int) $idOrderDetail;
+ $idOrder = (int) $idOrder;
+ $idHtlBooking = (int) $idHtlBooking;
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ if (!Configuration::get('QLO_USE_TOURISM_TAX') || !$idTaxRulesGroup || !$idOrderDetail) {
+ return;
+ }
+
+ $taxAmounts = array();
+ $validNightsByTax = array();
+ if ($idTaxRulesGroup) {
+ $taxCalculator = TaxManagerFactory::getManager($address, $idTaxRulesGroup)->getTaxCalculator();
+ $taxAmounts = $taxCalculator->getTaxesAmount(
+ $unitPriceTaxExcl,
+ $checkInDate,
+ $numNights,
+ $numAdults,
+ $childrenAges,
+ $collectionType,
+ $quantity,
+ $idCurrency,
+ $validNightsByTax
+ );
+ }
+
+ $scopeColumn = $idServiceProductOrderDetail ? self::SCOPE_COLUMN_SERVICE : self::SCOPE_COLUMN_ROOM;
+ $scopeValue = $idServiceProductOrderDetail ?: $idHtlBooking;
+
+ self::deleteTourismRowsForScope($scopeColumn, $scopeValue);
+
+ foreach ($taxAmounts as $idTax => $rowAmount) {
+ $rowAmount = (float) $rowAmount;
+
+ $tourismTax = TaxConfiguration::getByTaxId((int) $idTax);
+ $divisor = ($tourismTax && $tourismTax->per_night)
+ ? max(1, (int) ($validNightsByTax[$idTax] ?? $numNights))
+ : max(1, (int) $quantity);
+
+ $taxRow = new OrderTaxDetail();
+ $taxRow->id_order = $idOrder;
+ $taxRow->id_order_detail = $idOrderDetail;
+ $taxRow->id_htl_booking = $idHtlBooking;
+ $taxRow->id_service_product_order_detail = $idServiceProductOrderDetail;
+ $taxRow->id_tax = (int) $idTax;
+ $taxRow->unit_amount = Tools::ps_round($rowAmount / $divisor, 6);
+ $taxRow->total_amount = $rowAmount;
+ $taxRow->add();
+ }
+
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_detail`
+ SET `id_tourism_tax_rule_group` = ' . $idTaxRulesGroup . '
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+
+ self::recomputeInclusivePrice($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail);
+ }
+
+ /**
+ * Sum of VAT + tourism tax rows (exemption-aware) for one scope value of one order_tax_detail column.
+ *
+ * @param string $scopeColumn e.g. 'id_order_detail', self::SCOPE_COLUMN_ROOM, self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return float
+ */
+ private static function computeScopedTaxSum($scopeColumn, $scopeValue)
+ {
+ return (float) Db::getInstance()->getValue(
+ 'SELECT COALESCE(SUM(
+ CASE WHEN t.`is_tourism_tax` = 1 AND ex.`id_order_tax_exemption` IS NOT NULL THEN 0
+ ELSE ott.`total_amount`
+ END
+ ), 0)
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax`
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE ott.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * A WITH_ROOM auto-add service line's own VAT never gets an order_tax_detail row (it's baked into
+ * the room's price via room-rate substitution instead — see saveTaxCalculator()'s WITH_ROOM skip).
+ * This reconstructs that "phantom" VAT for one service instance so its own inclusive total is complete.
+ *
+ * @param array $serviceRow id_product, id_htl_booking_detail, total_price_tax_excl from service_product_order_detail
+ * @param int $idOrder
+ * @return float
+ */
+ private static function computePhantomVatForServiceLine(array $serviceRow, $idOrder)
+ {
+ if (!$serviceRow['id_htl_booking_detail']) {
+ return 0.0;
+ }
+
+ $roomBooking = new HotelBookingDetail((int) $serviceRow['id_htl_booking_detail']);
+ if (!Validate::isLoadedObject($roomBooking)) {
+ return 0.0;
+ }
+
+ $priceInfo = RoomTypeServiceProductPrice::getProductRoomTypePriceAndTax(
+ (int) $serviceRow['id_product'],
+ (int) $roomBooking->id_product,
+ RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE
+ );
+ if (!$priceInfo || !isset($priceInfo['id_tax_rules_group'])) {
+ return 0.0;
+ }
+
+ $order = new Order((int) $idOrder);
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType(
+ (int) $roomBooking->id_hotel,
+ new Address((int) $order->id_address_tax)
+ );
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return 0.0;
+ }
+
+ $totalPriceTaxExcl = (float) $serviceRow['total_price_tax_excl'];
+ $taxCalculator = TaxManagerFactory::getManager($address, (int) $priceInfo['id_tax_rules_group'])->getTaxCalculator();
+
+ return $taxCalculator->addTaxes($totalPriceTaxExcl) - $totalPriceTaxExcl;
+ }
+
+ /**
+ * A room booking's own tax-inclusive total: its own price plus only ITS OWN order_tax_detail rows
+ * (scoped by id_htl_booking) — never another booking's, even when several bookings of the same
+ * room type share one order_detail row (same product, different date ranges).
+ *
+ * @param int $idHtlBooking
+ * @return float
+ */
+ private static function computeRoomBookingInclusivePrice($idHtlBooking)
+ {
+ $totalPriceTaxExcl = (float) Db::getInstance()->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . (int) $idHtlBooking
+ );
+
+ return $totalPriceTaxExcl + self::computeScopedTaxSum(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ }
+
+ /**
+ * A service line instance's own tax-inclusive total: its own price plus only ITS OWN order_tax_detail
+ * rows (scoped by id_service_product_order_detail) plus its own phantom VAT share if WITH_ROOM auto-add
+ * — never another instance's, even when several instances of the same service share one order_detail row.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param array $orderDetailRow product_auto_add, product_price_addition_type, id_order (shared by all
+ * instances under this order_detail, since they're all the same product)
+ * @return float
+ */
+ private static function computeServiceLineInclusivePrice($idServiceProductOrderDetail, array $orderDetailRow)
+ {
+ $serviceRow = Db::getInstance()->getRow(
+ 'SELECT `total_price_tax_excl`, `id_product`, `id_htl_booking_detail`
+ FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ $totalPriceTaxExcl = (float) $serviceRow['total_price_tax_excl'];
+
+ $phantomVat = 0.0;
+ if ($orderDetailRow['product_auto_add']
+ && (int) $orderDetailRow['product_price_addition_type'] === Product::PRICE_ADDITION_TYPE_WITH_ROOM
+ ) {
+ $phantomVat = self::computePhantomVatForServiceLine($serviceRow, (int) $orderDetailRow['id_order']);
+ }
+
+ return $totalPriceTaxExcl + self::computeScopedTaxSum(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail) + $phantomVat;
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking unused; kept for call-site compatibility
+ * @param int $idServiceProductOrderDetail unused; kept for call-site compatibility
+ * @return bool
+ */
+ protected static function recomputeInclusivePrice($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $db = Db::getInstance();
+
+ $orderDetailRow = $db->getRow(
+ 'SELECT `product_quantity`, `product_auto_add`, `product_price_addition_type`, `id_order`
+ FROM `' . _DB_PREFIX_ . 'order_detail`
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+
+ $result = true;
+ $aggregateTaxIncl = 0.0;
+
+ $roomIds = $db->executeS(
+ 'SELECT `id` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($roomIds as $row) {
+ $roomTaxIncl = self::computeRoomBookingInclusivePrice((int) $row['id']);
+ $aggregateTaxIncl += $roomTaxIncl;
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'htl_booking_detail`
+ SET `total_price_tax_incl` = ' . $roomTaxIncl . '
+ WHERE `id` = ' . (int) $row['id']
+ ) && $result;
+ }
+
+ $serviceIds = $db->executeS(
+ 'SELECT `id_service_product_order_detail`, `quantity`
+ FROM `' . _DB_PREFIX_ . 'service_product_order_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($serviceIds as $row) {
+ $serviceTaxIncl = self::computeServiceLineInclusivePrice((int) $row['id_service_product_order_detail'], $orderDetailRow);
+ $aggregateTaxIncl += $serviceTaxIncl;
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'service_product_order_detail`
+ SET `total_price_tax_incl` = ' . $serviceTaxIncl . ',
+ `unit_price_tax_incl` = COALESCE(' . $serviceTaxIncl . ' / NULLIF(' . (int) $row['quantity'] . ', 0), 0)
+ WHERE `id_service_product_order_detail` = ' . (int) $row['id_service_product_order_detail']
+ ) && $result;
+ }
+
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_detail`
+ SET `total_price_tax_incl` = ' . $aggregateTaxIncl . ',
+ `unit_price_tax_incl` = COALESCE(' . $aggregateTaxIncl . ' / NULLIF(`product_quantity`, 0), 0)
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ ) && $result;
+
+ return $result;
+ }
+
+ /**
+ * Breakdown for invoice/PDF — grouped by id_tax, excluding exempted (via marker) or refunded rows, cached per order+lang.
+ *
+ * @param int $idOrder
+ * @param int|null $idLang defaults to the current context language
+ * @return array
+ */
+ public static function getBreakdownForInvoice($idOrder, $idLang = null)
+ {
+ $idOrder = (int) $idOrder;
+ $idLang = $idLang !== null ? (int) $idLang : (int) Context::getContext()->language->id;
+ $cacheId = 'OrderTaxDetail::getBreakdownForInvoice-' . $idOrder . '-' . $idLang;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = Db::getInstance()->executeS(
+ 'SELECT ott.`id_tax`, tl.`name` AS tax_name,
+ SUM(ott.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = ott.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ LEFT JOIN `' . _DB_PREFIX_ . 'tax_lang` tl
+ ON tl.`id_tax` = ott.`id_tax` AND tl.`id_lang` = ' . $idLang . '
+ WHERE ott.`id_order` = ' . $idOrder . '
+ AND ((ott.`id_htl_booking` != 0 AND hbd.`is_refunded` = 0)
+ OR (ott.`id_htl_booking` = 0 AND spod.`is_refunded` = 0))
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY ott.`id_tax`, tl.`name`'
+ );
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax total per order_detail line. Same
+ * exemption/refund-aware join as getBreakdownForInvoice(), grouped by id_order_detail instead of
+ * id_tax.
+ *
+ * @param int $idOrder
+ * @return array [id_order_detail => total_amount]
+ */
+ public static function getAmountsByOrderDetail($idOrder)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getAmountsByOrderDetail-' . $idOrder;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $rows = Db::getInstance()->executeS(
+ 'SELECT ott.`id_order_detail`, SUM(ott.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = ott.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE ott.`id_order` = ' . $idOrder . '
+ AND ((ott.`id_htl_booking` != 0 AND hbd.`is_refunded` = 0)
+ OR (ott.`id_htl_booking` = 0 AND spod.`is_refunded` = 0))
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY ott.`id_order_detail`'
+ );
+
+ $result = array();
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_order_detail']] = (float) $row['total_amount'];
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * The single source of truth for an order's tourism tax total — applied, non-exempted, non-refunded.
+ *
+ * @param int $idOrder
+ * @return float
+ */
+ public static function getOrderTourismTaxTotal($idOrder)
+ {
+ return (float) array_sum(array_column(self::getBreakdownForInvoice((int) $idOrder), 'total_amount'));
+ }
+
+ /**
+ * Whether a scope is refunded — apply/exempt must not touch a cancelled booking/service line.
+ * Reads the authoritative flag directly (htl_booking_detail/service_product_order_detail),
+ * not a stored copy on order_tax_detail.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function hasRefundedRowsForScope($scopeColumn, $scopeValue)
+ {
+ $scopeValue = (int) $scopeValue;
+ if ($scopeColumn === self::SCOPE_COLUMN_ROOM) {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT `is_refunded` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . $scopeValue
+ );
+ }
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT `is_refunded` FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . $scopeValue
+ );
+ }
+
+ /**
+ * Resolve every parameter saveTourismTax() needs for an already-placed room booking, from the booking's own hotel (not the order's single id_address_tax column).
+ *
+ * @param int $idHtlBooking
+ * @return array|false Ordered args for self::saveTourismTax(), or false when the
+ * booking/order/TRG/address can't be resolved
+ */
+ public static function buildRoomTaxParams($idHtlBooking)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return false;
+ }
+
+ $order = new Order((int) $booking->id_order);
+ if (!Validate::isLoadedObject($order)) {
+ return false;
+ }
+
+ $idTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $booking->id_product);
+ if (!$idTaxRulesGroup) {
+ return false;
+ }
+
+ $idHotel = (int) $booking->id_hotel;
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, new Address((int) $order->id_address_tax));
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return false;
+ }
+ $collectionType = $hotelContext['collectionType'];
+
+ $numNights = (int) HotelHelper::getNumberOfDays($booking->date_from, $booking->date_to);
+ if ($numNights <= 0) {
+ return false;
+ }
+
+ $unitPriceTaxExcl = Tools::ps_round((float) $booking->total_price_tax_excl / $numNights, 6);
+
+ $childrenAges = array();
+ if ($booking->child_ages) {
+ $decoded = json_decode($booking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+
+ return array(
+ 'idTaxRulesGroup' => $idTaxRulesGroup,
+ 'address' => $address,
+ 'unitPriceTaxExcl' => $unitPriceTaxExcl,
+ 'checkInDate' => $booking->date_from,
+ 'numNights' => $numNights,
+ 'numAdults' => (int) $booking->adults,
+ 'childrenAges' => $childrenAges,
+ 'idCurrency' => (int) $order->id_currency,
+ 'collectionType' => $collectionType,
+ 'idLang' => (int) Context::getContext()->language->id,
+ 'quantity' => 1,
+ 'idOrder' => (int) $booking->id_order,
+ 'idOrderDetail' => (int) $booking->id_order_detail,
+ 'idHtlBooking' => $idHtlBooking,
+ 'idServiceProductOrderDetail' => 0,
+ );
+ }
+
+ /**
+ * Same as buildRoomTaxParams(), for an already-placed service product line.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @return array|false
+ */
+ public static function buildServiceLineTaxParams($idServiceProductOrderDetail)
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ if (!Validate::isLoadedObject($serviceLine)) {
+ return false;
+ }
+
+ $order = new Order((int) $serviceLine->id_order);
+ if (!Validate::isLoadedObject($order)) {
+ return false;
+ }
+
+ $idTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $serviceLine->id_product);
+ if (!$idTaxRulesGroup) {
+ return false;
+ }
+
+ $idHotel = (int) $serviceLine->id_hotel;
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, new Address((int) $order->id_address_tax));
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return false;
+ }
+ $collectionType = $hotelContext['collectionType'];
+
+ $idHtlBookingDetail = (int) $serviceLine->id_htl_booking_detail;
+ $roomBooking = $idHtlBookingDetail ? new HotelBookingDetail($idHtlBookingDetail) : null;
+ if ($roomBooking && Validate::isLoadedObject($roomBooking)) {
+ $checkInDate = $roomBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($roomBooking->date_from, $roomBooking->date_to));
+ $numAdults = (int) $roomBooking->adults;
+ $childrenAges = array();
+ if ($roomBooking->child_ages) {
+ $decoded = json_decode($roomBooking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+ } else {
+ $checkInDate = date('Y-m-d');
+ $numNights = 1;
+ $numAdults = 1;
+ $childrenAges = array();
+ }
+
+ return array(
+ 'idTaxRulesGroup' => $idTaxRulesGroup,
+ 'address' => $address,
+ 'unitPriceTaxExcl' => (float) $serviceLine->unit_price_tax_excl,
+ 'checkInDate' => $checkInDate,
+ 'numNights' => $numNights,
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges,
+ 'idCurrency' => (int) $order->id_currency,
+ 'collectionType' => $collectionType,
+ 'idLang' => (int) Context::getContext()->language->id,
+ 'quantity' => (int) $serviceLine->quantity,
+ 'idOrder' => (int) $serviceLine->id_order,
+ 'idOrderDetail' => (int) $serviceLine->id_order_detail,
+ 'idHtlBooking' => 0,
+ 'idServiceProductOrderDetail' => $idServiceProductOrderDetail,
+ );
+ }
+
+ /**
+ * Call saveTourismTax() with a buildRoomTaxParams()/buildServiceLineTaxParams() result.
+ *
+ * @param array $params
+ * @return void
+ */
+ protected static function saveTourismTaxFromParams(array $params)
+ {
+ self::saveTourismTax(
+ $params['idTaxRulesGroup'],
+ $params['address'],
+ $params['unitPriceTaxExcl'],
+ $params['checkInDate'],
+ $params['numNights'],
+ $params['numAdults'],
+ $params['childrenAges'],
+ $params['idCurrency'],
+ $params['collectionType'],
+ $params['idLang'],
+ $params['quantity'],
+ $params['idOrder'],
+ $params['idOrderDetail'],
+ $params['idHtlBooking'],
+ $params['idServiceProductOrderDetail']
+ );
+ }
+
+ /**
+ *
+ * @param int $idOrder
+ * @param int $idEmployee
+ * @param string $autoMsg
+ * @param string|null $note Optional remark appended as "| {$remarkLabel}: ..." — omit for apply actions
+ * @param string $remarkLabel Pre-translated "Remark" label
+ */
+ protected static function saveTourismTaxNote($idOrder, $idEmployee, $autoMsg, $note = null, $remarkLabel = 'Remark')
+ {
+ $noteMessage = $autoMsg . ($note && Validate::isMessage($note) ? ' | ' . $remarkLabel . ': ' . $note : '');
+ $message = new Message();
+ $message->message = $noteMessage;
+ $message->id_order = (int) $idOrder;
+ $message->id_employee = (int) $idEmployee;
+ $message->private = 1;
+ $message->save();
+ }
+
+ /**
+ * Exempt a booking's tourism tax — one marker row covers the room and every service attached to
+ * it. Idempotent: exempting an already-exempted booking is a no-op success.
+ *
+ * @param int $idHtlBooking
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $note Reason for exemption, entered by the employee
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return int EXEMPT_OK | EXEMPT_ERROR_NO_RULE | EXEMPT_ERROR_SAVE
+ */
+ public static function exemptBooking($idHtlBooking, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ if (self::isBookingExempted($idHtlBooking)) {
+ return self::EXEMPT_OK;
+ }
+
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return self::EXEMPT_ERROR_NO_RULE;
+ }
+
+ $objOrderTaxExemption = new OrderTaxExemption();
+ $objOrderTaxExemption->id_htl_booking = $idHtlBooking;
+ $objOrderTaxExemption->id_service_product_order_detail = 0;
+ $objOrderTaxExemption->id_order = (int) $booking->id_order;
+ $objOrderTaxExemption->id_employee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $objOrderTaxExemption->note = $note;
+ if (!$objOrderTaxExemption->add()) {
+ return self::EXEMPT_ERROR_SAVE;
+ }
+
+ if ($autoMsgLabel !== null) {
+ $roomTypeName = Product::getProductName((int) $booking->id_product, null, Context::getContext()->language->id);
+ $autoMsg = $autoMsgLabel . ': ' . $booking->room_num . ' - ' . $roomTypeName . ': ('
+ . date('d/m/Y', strtotime($booking->date_from)) . ' - ' . date('d/m/Y', strtotime($booking->date_to)) . ')';
+ self::saveTourismTaxNote((int) $booking->id_order, $objOrderTaxExemption->id_employee, $autoMsg, $note, $remarkLabel);
+ }
+
+ self::syncDenormalizedTotalsForBooking($idHtlBooking, false);
+
+ return self::EXEMPT_OK;
+ }
+
+ /**
+ * Apply (or re-apply) tourism tax for a booking — deletes the exemption marker if one exists,
+ * restoring the room + every attached service's tax into the denormalized display totals. If
+ * nothing has ever been computed for the room and/or a given service line (e.g. config was off
+ * at order time), computes it fresh instead.
+ *
+ * @param int $idHtlBooking
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely
+ * @return int APPLY_OK | APPLY_ERROR_RESTORE | APPLY_ERROR_NOT_APPLICABLE
+ */
+ public static function applyBooking($idHtlBooking, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ $wasExempted = self::isBookingExempted($idHtlBooking);
+ $changed = $wasExempted;
+ if ($wasExempted) {
+ if (!self::deleteExemptionMarker($idHtlBooking, 0)) {
+ return self::APPLY_ERROR_RESTORE;
+ }
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ }
+
+ if (self::hasNeverBeenComputed(self::SCOPE_COLUMN_ROOM, $idHtlBooking)) {
+ $params = self::buildRoomTaxParams($idHtlBooking);
+ if ($params) {
+ $params['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($params);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_ROOM, $idHtlBooking, $params['idOrder']);
+ }
+ }
+ }
+
+ $idServiceLines = ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHtlBooking);
+ foreach ($idServiceLines as $idServiceLine) {
+ if ($wasExempted) {
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_SERVICE, $idServiceLine);
+ }
+ if (!self::hasNeverBeenComputed(self::SCOPE_COLUMN_SERVICE, $idServiceLine)) {
+ continue;
+ }
+ $svcParams = self::buildServiceLineTaxParams($idServiceLine);
+ if ($svcParams) {
+ $svcParams['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($svcParams);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_SERVICE, $idServiceLine, $svcParams['idOrder']);
+ }
+ }
+ }
+
+ if ($wasExempted) {
+ self::syncDenormalizedTotalsForBooking($idHtlBooking, true);
+ }
+
+ $hasAnyTourismTax = self::getScopedTotal(self::SCOPE_COLUMN_ROOM, $idHtlBooking) > 0;
+ foreach ($idServiceLines as $idServiceLine) {
+ if ($hasAnyTourismTax) {
+ break;
+ }
+ $hasAnyTourismTax = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceLine) > 0;
+ }
+ if (!$hasAnyTourismTax) {
+ return self::APPLY_ERROR_NOT_APPLICABLE;
+ }
+
+ if ($autoMsgLabel !== null && $changed) {
+ $idEmployee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $roomTypeName = Product::getProductName((int) $booking->id_product, null, Context::getContext()->language->id);
+ $autoMsg = $autoMsgLabel . ': ' . $booking->room_num . ' - ' . $roomTypeName . ': ('
+ . date('d/m/Y', strtotime($booking->date_from)) . ' - ' . date('d/m/Y', strtotime($booking->date_to)) . ')';
+ self::saveTourismTaxNote((int) $booking->id_order, $idEmployee, $autoMsg);
+ }
+
+ return self::APPLY_OK;
+ }
+
+ /**
+ * Exempt a single standalone (no room attachment) service line directly — the one case a
+ * booking-level marker can't cover, since there's no booking to attach it to.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param int $idEmployee
+ * @param string|null $note
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label — null skips the Order Notes entry entirely
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return int EXEMPT_OK | EXEMPT_ERROR_NO_RULE | EXEMPT_ERROR_SAVE
+ */
+ public static function exemptServiceLine($idServiceProductOrderDetail, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ if (self::isServiceLineExempted($idServiceProductOrderDetail)) {
+ return self::EXEMPT_OK;
+ }
+
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ if (!Validate::isLoadedObject($serviceLine) || $serviceLine->id_htl_booking_detail) {
+ return self::EXEMPT_ERROR_NO_RULE;
+ }
+
+ $objOrderTaxExemption = new OrderTaxExemption();
+ $objOrderTaxExemption->id_htl_booking = 0;
+ $objOrderTaxExemption->id_service_product_order_detail = $idServiceProductOrderDetail;
+ $objOrderTaxExemption->id_order = (int) $serviceLine->id_order;
+ $objOrderTaxExemption->id_employee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $objOrderTaxExemption->note = $note;
+ if (!$objOrderTaxExemption->add()) {
+ return self::EXEMPT_ERROR_SAVE;
+ }
+
+ if ($autoMsgLabel !== null) {
+ $autoMsg = $autoMsgLabel . ': ' . $serviceLine->name;
+ self::saveTourismTaxNote((int) $serviceLine->id_order, $objOrderTaxExemption->id_employee, $autoMsg, $note, $remarkLabel);
+ }
+
+ $total = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ if ($total) {
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceProductOrderDetail);
+ self::adjustOrderAndInvoiceTotals((int) $serviceLine->id_order, -$total);
+ }
+
+ return self::EXEMPT_OK;
+ }
+
+ /**
+ * Apply (or re-apply) tourism tax for a single standalone service line.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely
+ * @return int APPLY_OK | APPLY_ERROR_RESTORE | APPLY_ERROR_NOT_APPLICABLE
+ */
+ public static function applyServiceLine($idServiceProductOrderDetail, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ $wasExempted = self::isServiceLineExempted($idServiceProductOrderDetail);
+ $changed = $wasExempted;
+ if ($wasExempted) {
+ if (!self::deleteExemptionMarker(0, $idServiceProductOrderDetail)) {
+ return self::APPLY_ERROR_RESTORE;
+ }
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ }
+
+ if (self::hasNeverBeenComputed(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail)) {
+ $params = self::buildServiceLineTaxParams($idServiceProductOrderDetail);
+ if ($params) {
+ $params['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($params);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail, $params['idOrder']);
+ }
+ }
+ }
+
+ if ($wasExempted) {
+ $total = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ if ($total && Validate::isLoadedObject($serviceLine)) {
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceProductOrderDetail);
+ self::adjustOrderAndInvoiceTotals((int) $serviceLine->id_order, $total);
+ }
+ }
+
+ if (self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail) <= 0) {
+ return self::APPLY_ERROR_NOT_APPLICABLE;
+ }
+
+ if ($autoMsgLabel !== null && $changed) {
+ $idEmployee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $autoMsg = $autoMsgLabel . ': ' . $serviceLine->name;
+ self::saveTourismTaxNote((int) $serviceLine->id_order, $idEmployee, $autoMsg);
+ }
+
+ return self::APPLY_OK;
+ }
+
+ /**
+ * Exempt tourism tax for every booking (room + attached services) and every standalone service line
+ * of an order; returns only the failing entries.
+ *
+ * @param int $idOrder
+ * @param int $idEmployee
+ * @param string|null $note Reason for exemption, applied to every booking/line in the order
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label — null skips the Order Notes entry entirely, for every booking/line in the order
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
+ * [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
+ */
+ public static function exemptForOrder($idOrder, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idOrder = (int) $idOrder;
+ $failures = array();
+ $objBookingDetail = new HotelBookingDetail();
+ $bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
+ if ($bookings) {
+ foreach ($bookings as $booking) {
+ if (!empty($booking['is_refunded']) || !empty($booking['is_cancelled'])) {
+ continue;
+ }
+ $result = self::exemptBooking($booking['id'], $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if ($result !== self::EXEMPT_OK) {
+ $failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
+ }
+ }
+ }
+ foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ $result = self::exemptServiceLine($idServiceLine, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if ($result !== self::EXEMPT_OK) {
+ $failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
+ }
+ }
+ return $failures;
+ }
+
+ /**
+ * Apply tourism tax for every booking and every standalone service line of an order; returns only
+ * the failing entries. A booking/line with nothing applicable (neither the room nor any attached
+ * service, or the standalone line itself, has a tourism tax rule) is not a failure — it's silently
+ * skipped, same as if it had simply been left alone.
+ *
+ * @param int $idOrder
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely, for every booking/line in the order
+ * @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
+ * [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
+ */
+ public static function applyForOrder($idOrder, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idOrder = (int) $idOrder;
+ $failures = array();
+ $objBookingDetail = new HotelBookingDetail();
+ $bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
+ if ($bookings) {
+ foreach ($bookings as $booking) {
+ if (!empty($booking['is_refunded']) || !empty($booking['is_cancelled'])) {
+ continue;
+ }
+ $result = self::applyBooking($booking['id'], $idEmployee, $autoMsgLabel);
+ if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
+ $failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
+ }
+ }
+ }
+ foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ $result = self::applyServiceLine($idServiceLine, $idEmployee, $autoMsgLabel);
+ if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
+ $failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
+ }
+ }
+ return $failures;
+ }
+
+ /**
+ * After fresh-computing tourism tax for a scope that had no prior rows (e.g. config was off at
+ * order time), fold the newly-applied total into the order's own totals — recomputeInclusivePrice()
+ * (called inside saveTourismTax()) only syncs order_detail/htl_booking_detail/service_product_order_detail,
+ * never orders/order_invoice.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @param int $idOrder
+ * @return void
+ */
+ protected static function adjustOrderTotalsForNewRows($scopeColumn, $scopeValue, $idOrder)
+ {
+ $appliedTotal = self::getScopedTotal($scopeColumn, $scopeValue);
+ self::adjustOrderAndInvoiceTotals($idOrder, $appliedTotal);
+ }
+
+ /**
+ * Sum the room's own tax + every attached service line's tax and apply that whole delta once —
+ * used on exemptBooking()/applyBooking() to move the booking's tourism tax in or out of the
+ * denormalized display totals in one pass, rather than per-row.
+ *
+ * @param int $idHtlBooking
+ * @param bool $nowIncluded true = restoring (apply), false = removing (exempt)
+ * @return void
+ */
+ protected static function syncDenormalizedTotalsForBooking($idHtlBooking, $nowIncluded)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return;
+ }
+ $totalDelta = 0.0;
+
+ $roomTotal = self::getScopedTotal(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ if ($roomTotal) {
+ $prev = $nowIncluded ? 0.0 : $roomTotal;
+ $new = $nowIncluded ? $roomTotal : 0.0;
+ self::recomputeInclusivePrice((int) $booking->id_order_detail, $idHtlBooking, 0);
+ $totalDelta += ($new - $prev);
+ }
+
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHtlBooking) as $idServiceLine) {
+ $serviceTotal = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceLine);
+ if (!$serviceTotal) {
+ continue;
+ }
+ $serviceLine = new ServiceProductOrderDetail($idServiceLine);
+ if (!Validate::isLoadedObject($serviceLine)) {
+ continue;
+ }
+ $prev = $nowIncluded ? 0.0 : $serviceTotal;
+ $new = $nowIncluded ? $serviceTotal : 0.0;
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceLine);
+ $totalDelta += ($new - $prev);
+ }
+
+ self::adjustOrderAndInvoiceTotals((int) $booking->id_order, $totalDelta);
+ }
+
+ /**
+ * Apply an applied-tourism-tax delta to both the order's own totals and every invoice already generated for it.
+ *
+ * @param int $idOrder
+ * @param float $delta Signed — positive when restoring/adding tax, negative when exempting it
+ */
+ protected static function adjustOrderAndInvoiceTotals($idOrder, $delta)
+ {
+ $delta = (float) $delta;
+ if (!$delta) {
+ return;
+ }
+
+ $idOrder = (int) $idOrder;
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'orders`
+ SET `total_paid_tax_incl` = GREATEST(0, `total_paid_tax_incl` + ' . $delta . '),
+ `total_paid_tax_excl` = GREATEST(0, `total_paid_tax_excl` + ' . $delta . '),
+ `total_paid` = GREATEST(0, `total_paid` + ' . $delta . ')
+ WHERE `id_order` = ' . $idOrder
+ );
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_invoice`
+ SET `total_paid_tax_incl` = GREATEST(0, `total_paid_tax_incl` + ' . $delta . '),
+ `total_paid_tax_excl` = GREATEST(0, `total_paid_tax_excl` + ' . $delta . ')
+ WHERE `id_order` = ' . $idOrder
+ );
+ }
+}
\ No newline at end of file
diff --git a/classes/order/OrderTaxExemption.php b/classes/order/OrderTaxExemption.php
new file mode 100644
index 000000000..dbbac21c3
--- /dev/null
+++ b/classes/order/OrderTaxExemption.php
@@ -0,0 +1,46 @@
+ 'order_tax_exemption',
+ 'primary' => 'id_order_tax_exemption',
+ 'fields' => array(
+ 'id_htl_booking' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_service_product_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_employee' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'note' => array('type' => self::TYPE_STRING, 'validate' => 'isMessage', 'allow_null' => true),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ ),
+ );
+}
diff --git a/classes/pdf/HTMLTemplateBookingVoucher.php b/classes/pdf/HTMLTemplateBookingVoucher.php
index c4e5d17df..890a5772d 100644
--- a/classes/pdf/HTMLTemplateBookingVoucher.php
+++ b/classes/pdf/HTMLTemplateBookingVoucher.php
@@ -159,17 +159,6 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
// Services for this booking
$bookingServices = array();
- $objBookingDemand = new HotelBookingDemands();
- $extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 0, 0, 0,
- (int)$booking['id'], (int)$booking['id_order_detail']
- );
- if (is_array($extraDemands)) {
- foreach ($extraDemands as $demand) {
- $bookingServices[] = array('name' => $demand['name'], 'quantity' => 1);
- }
- }
-
// Auto-added services bundled with room price (for cost calculation only)
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$autoAddedWithRoomPriceTaxExcl = (float)$objServiceProductOrderDetail->getRoomTypeServiceProducts(
@@ -181,7 +170,7 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
1, 0, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM
);
- // Additional services chosen by guest
+ // Extra services chosen by guest
$additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0, 0, 0, 0, 0, 0, 0, 0, 1, 0, null, 0, (int)$booking['id']
);
@@ -274,13 +263,10 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
}
}
// --- Totals ---
- $objBookingDemand = new HotelBookingDemands();
- $totalDemandsPriceTE = (float)$objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 1, 1, 0
- );
- $totalDemandsPriceTI = (float)$objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 1, 1, 1
- );
+ // Extra demands feature was removed from the system; kept as 0 so the
+ // additive totals below stay correct without the deleted HotelBookingDemands class.
+ $totalDemandsPriceTE = 0;
+ $totalDemandsPriceTI = 0;
$orderDetails = OrderDetail::getList((int)$this->order->id);
$idsOrderDetail = is_array($orderDetails)
@@ -321,7 +307,9 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
$footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'] + $footer['service_products_price_tax_excl'];
$totalWithoutDiscountTaxIncl = $roomsCostTaxIncl + $serviceProductsCostTaxIncl + $additionalServicesCostTaxIncl + $convenienceFeeTaxIncl;
- $footer['total_tax_without_discount'] = max(0, $totalWithoutDiscountTaxIncl - $footer['total_without_discount_te']);
+ $totalTourismTax = OrderTaxDetail::getOrderTourismTaxTotal((int) $this->order->id);
+ $footer['total_tax_without_discount'] = max(0, $totalWithoutDiscountTaxIncl - $footer['total_without_discount_te'] - $totalTourismTax);
+ $footer['total_tourism_tax'] = $totalTourismTax;
$grandTotal = max(0.0, $totalWithoutDiscountTaxIncl - $productDiscountsTaxIncl);
$footer['product_discounts_tax_incl'] = $productDiscountsTaxIncl;
$footer['total_paid_tax_incl'] = $grandTotal;
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index e5b36b518..514b001d4 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -312,7 +312,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$cart_htl_data = array();
$service_product_data = array();
- $room_extra_demands = array();
$room_additinal_services = array();
$formattedHotelAddress = '';
if (Module::isInstalled('hotelreservationsystem')) {
@@ -335,8 +334,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
if (!empty($order_details)) {
$processed_product = array();
- $totalDemandsPriceTE = 0;
- $totalDemandsPriceTI = 0;
foreach ($order_details as $type_key => $type_value) {
$processProductKey = $type_value['product_id'].'_'.$type_value['selling_preference_type'].'_'.$type_value['id_order_detail'];
if (isset($processed_product[$processProductKey])) {
@@ -360,9 +357,32 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, 0, $type_value['product_id'], $idCustomer, $type_value['id_order_detail']);
$cart_htl_data[$type_key]['id_product'] = $type_value['product_id'];
- $objBookingDemand = new HotelBookingDemands();
foreach ($order_bk_data as $data_k => $data_v) {
- $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']);
+ $display_date_from = $data_v['date_from'];
+ $display_date_to = $data_v['date_to'];
+ if ($data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_OUT) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out']) {
+ $display_date_to = $data_v['check_out'];
+ }
+ } elseif ($data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_IN) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ } else {
+ if ($data_v['check_in_time']) {
+ $display_date_from = date('Y-m-d', strtotime($data_v['date_from'])) . ' ' . date('H:i:s', strtotime($data_v['check_in_time']));
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ }
+ $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']).strtotime($display_date_from).strtotime($display_date_to);
/*Product price when order was created*/
$order_details_obj = new OrderDetail($data_v['id_order_detail']);
@@ -386,30 +406,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
// For order refund
$cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room'];
} else {
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0,
- 0,
- $type_value['id_order_detail']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1,
- 0,
- $type_value['id_order_detail']
- );
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order_obj->id,
0,
@@ -473,31 +469,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
- $fullDate = (isset($context->controller->show_full_date) && $context->controller->show_full_date && (date('Y-m-d', strtotime($data_v['date_from'])) == date('Y-m-d', strtotime($data_v['date_to'])))) ? true : false;
- $display_date_from = $data_v['date_from'];
- $display_date_to = $data_v['date_to'];
- if ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_OUT) {
- if ($data_v['check_in']) {
- $display_date_from = $data_v['check_in'];
- }
- if ($data_v['check_out']) {
- $display_date_to = $data_v['check_out'];
- }
- } elseif ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_IN) {
- if ($data_v['check_in']) {
- $display_date_from = $data_v['check_in'];
- }
- if ($data_v['check_out_time']) {
- $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
- }
- } else {
- if ($data_v['check_in_time']) {
- $display_date_from = date('Y-m-d', strtotime($data_v['date_from'])) . ' ' . date('H:i:s', strtotime($data_v['check_in_time']));
- }
- if ($data_v['check_out_time']) {
- $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
- }
- }
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($display_date_from, null, true);
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($display_date_to, null, true);
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days;
@@ -514,32 +485,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room'];
}
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0,
- $data_v['id']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1,
- $data_v['id']
- );
-
- $totalDemandsPriceTE += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'];
- $totalDemandsPriceTI += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'];
-
$cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_excl'] += $data_v['total_price_tax_excl'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_incl'] += $data_v['total_price_tax_incl'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objServiceProductOrderDetail->getroomTypeServiceProducts(
@@ -569,25 +514,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
Product::PRICE_ADDITION_TYPE_WITH_ROOM
);
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 1,
- 0,
- 1,
- $data_v['id']
- )) {
- $extraDemands = array_shift($extraDemands);
- $extraDemands['product_id'] = $type_value['product_id'];
- $extraDemands['room_type_name'] = $type_value['product_name'];
- $extraDemands['date_from'] = $data_v['date_from'];
- $extraDemands['date_to'] = $data_v['date_to'];
- $room_extra_demands[] = $extraDemands;
- }
-
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -657,10 +583,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
}
unset($tax_temp);
-
- // enter extra demands price to the footer total details
- $footer['total_extra_demands_ti'] = $totalDemandsPriceTI;
- $footer['total_extra_demands_te'] = $totalDemandsPriceTE;
}
}
@@ -677,8 +599,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
$footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
$footer['service_products_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
- $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE;
- $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI;
+ $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail);
+ $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail);
$footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
$footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
}
@@ -687,7 +609,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'] + $footer['service_products_price_tax_excl'];
$footer['total_without_discount_ti'] = $footer['room_price_tax_incl'] + $footer['total_convenience_fee_ti'] + $footer['additional_service_price_tax_incl'] + $footer['service_products_price_tax_incl'];
- $footer['total_tax_without_discount'] = $footer['total_without_discount_ti'] - $footer['total_without_discount_te'];
+ $footer['total_tourism_tax'] = OrderTaxDetail::getOrderTourismTaxTotal((int) $this->order->id);
+
+ $footer['total_tax_without_discount'] = $footer['total_without_discount_ti'] - $footer['total_without_discount_te'] - $footer['total_tourism_tax'];
if ($footer['total_tax_without_discount'] < 0) {
$footer['total_tax_without_discount'] = 0;
}
@@ -696,7 +620,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'cart_htl_data' => $cart_htl_data,
'is_hotel_order' => HotelBookingDetail::getIdHotelByIdOrder($this->order->id),
'service_product_data' => $service_product_data,
- 'room_extra_demands' => $room_extra_demands,
'room_additinal_services' => $room_additinal_services,
'order' => $this->order,
'order_invoice' => $this->order_invoice,
@@ -728,7 +651,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'summary_tab' => $this->smarty->fetch($this->getTemplate('invoice.summary-tab')),
'product_tab' => $this->smarty->fetch($this->getTemplate('invoice.product-tab')),
'service_product_tab' => $this->smarty->fetch($this->getTemplate('invoice.service-product-tab')),
- 'extra_demands_tab' => $this->smarty->fetch($this->getTemplate('invoice.extra-demands-tab')),
+ 'additinal_services_tab' => $this->smarty->fetch($this->getTemplate('invoice.additinal-services-tab')),
'tax_tab' => $this->getTaxTabContent(),
'payment_tab' => $this->smarty->fetch($this->getTemplate('invoice.payment-tab')),
'note_tab' => $this->smarty->fetch($this->getTemplate('invoice.note-tab')),
@@ -807,11 +730,11 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'room_tax' => $this->order_invoice->getRoomsTaxesBreakdown($this->order),
'additional_services_tax' => $this->order_invoice->getAdditionalServicesTaxesBreakdown($this->order),
'convenience_fee_tax' => $this->order_invoice->getConvenienceFeeTaxesBreakdown($this->order),
- 'extra_demands_tax' => $this->order_invoice->getExtraDemandTaxesBreakdown($this->order),
'service_products_tax' => $this->order_invoice->getServiceProductsTaxesBreakdown($this->order),
'shipping_tax' => $this->order_invoice->getShippingTaxesBreakdown($this->order),
'ecotax_tax' => $this->order_invoice->getEcoTaxTaxesBreakdown(),
'wrapping_tax' => $this->order_invoice->getWrappingTaxesBreakdown(),
+ 'tourism_tax' => $this->order_invoice->getTourismTaxBreakdown(),
);
foreach ($breakdowns as $type => $bd) {
@@ -842,12 +765,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
}
- if (isset($breakdowns['extra_demands_tax'])) {
- foreach ($breakdowns['extra_demands_tax'] as &$bd) {
- $bd['total_tax_excl'] = $bd['total_price_tax_excl'];
- }
- }
-
if (isset($breakdowns['service_products_tax'])) {
foreach ($breakdowns['service_products_tax'] as &$bd) {
$bd['total_tax_excl'] = $bd['total_price_tax_excl'];
diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php
index 16396243f..045eeb52a 100644
--- a/classes/pdf/HTMLTemplateOrderSlip.php
+++ b/classes/pdf/HTMLTemplateOrderSlip.php
@@ -267,10 +267,11 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
// 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
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` odt
LEFT JOIN `' . _DB_PREFIX_ . 'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
WHERE od.`id_order` = ' . (int) $this->order->id . '
- AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD)
+ AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD . '
+ AND NOT EXISTS (SELECT 1 FROM `' . _DB_PREFIX_ . 'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)')
|| Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
}
diff --git a/classes/tax/AverageTaxOfProductsTaxCalculator.php b/classes/tax/AverageTaxOfProductsTaxCalculator.php
index 272935920..3c07d12c6 100644
--- a/classes/tax/AverageTaxOfProductsTaxCalculator.php
+++ b/classes/tax/AverageTaxOfProductsTaxCalculator.php
@@ -20,9 +20,10 @@ class AverageTaxOfProductsTaxCalculator
$sql = 'SELECT t.id_tax, t.rate, od.total_price_tax_excl FROM '.$prefix.'orders o
INNER JOIN '.$prefix.'order_detail od ON od.id_order = o.id_order
- INNER JOIN '.$prefix.'order_detail_tax odt ON odt.id_order_detail = od.id_order_detail
+ INNER JOIN '.$prefix.'order_tax_detail odt ON odt.id_order_detail = od.id_order_detail
INNER JOIN '.$prefix.'tax t ON t.id_tax = odt.id_tax
- WHERE o.id_order = '.(int)$this->id_order;
+ WHERE o.id_order = '.(int)$this->id_order.'
+ AND NOT EXISTS (SELECT 1 FROM '.$prefix.'tax tc WHERE tc.id_tax = odt.id_tax AND tc.is_tourism_tax = 1)';
return $this->db->select($sql);
}
diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index a7f8ee1c3..8bfff493c 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -39,6 +39,9 @@ class TaxCore extends ObjectModel
/** @var bool true if the tax has been historized */
public $deleted = 0;
+ /** @var int 1 = this ps_tax row is a tourism tax (subtype params in tourism_tax) */
+ public $is_tourism_tax = 0;
+
/**
* @see ObjectModel::$definition
*/
@@ -47,11 +50,12 @@ class TaxCore extends ObjectModel
'primary' => 'id_tax',
'multilang' => true,
'fields' => array(
- 'rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
- 'active' => array('type' => self::TYPE_BOOL),
- 'deleted' => array('type' => self::TYPE_BOOL),
+ 'rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
+ 'active' => array('type' => self::TYPE_BOOL),
+ 'deleted' => array('type' => self::TYPE_BOOL),
+ 'is_tourism_tax' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
/* Lang fields */
- 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 32),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 32),
),
);
@@ -133,7 +137,7 @@ class TaxCore extends ObjectModel
{
return Db::getInstance()->getValue('
SELECT `id_tax`
- FROM `'._DB_PREFIX_.'order_detail_tax`
+ FROM `'._DB_PREFIX_.'order_tax_detail`
WHERE `id_tax` = '.(int)$this->id
);
}
diff --git a/classes/tax/TaxCalculator.php b/classes/tax/TaxCalculator.php
index df2d2d6df..38508d21d 100644
--- a/classes/tax/TaxCalculator.php
+++ b/classes/tax/TaxCalculator.php
@@ -132,14 +132,155 @@ class TaxCalculatorCore
/**
* Return the tax amount associated to each taxes of the TaxCalculator
*
- * @param float $price_te
+ * @param float $price_te
+ * @param string|null $checkInDate
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges
+ * @param int|null $collectionType
+ * @param int $quantity
+ * @param int|null $idCurrency
* @return array $taxes_amount
*/
- public function getTaxesAmount($price_te)
- {
+ public function getTaxesAmount(
+ $price_te,
+ $checkInDate = null,
+ $numNights = 1,
+ $numAdults = 1,
+ $childrenAges = array(),
+ $collectionType = null,
+ $quantity = 1,
+ $idCurrency = null,
+ &$validNightsByTax = null
+ ) {
$taxes_amounts = array();
+ $tourismTaxIds = array();
foreach ($this->taxes as $tax) {
+ if (TaxConfiguration::getByTaxId((int) $tax->id)) {
+ $tourismTaxIds[] = $tax->id;
+ }
+ }
+
+ if ($checkInDate !== null && $collectionType !== null && Configuration::get('QLO_USE_TOURISM_TAX') && $collectionType !== HotelBranchInformation::TAX_COLLECTION_TYPE_AT_HOTEL) {
+ if (!$idCurrency) {
+ $context = Context::getContext();
+ $idCurrency = Validate::isLoadedObject($context->currency) ? (int) $context->currency->id : (int) Configuration::get('PS_CURRENCY_DEFAULT');
+ }
+
+ $checkIn = new DateTime($checkInDate);
+ $isoDayIndex = $checkIn->format('N') - 1;
+
+ $infantMaxAge = Configuration::get('QLO_GLOBAL_MAX_INFANT_AGE');
+ $childMaxAge = Configuration::get('WK_GLOBAL_CHILD_MAX_AGE');
+ $eligibleChildAges = array_filter($childrenAges, function ($age) use ($infantMaxAge, $childMaxAge) {
+ return $age >= $infantMaxAge && $age < $childMaxAge;
+ });
+
+ $runningPriceExcl = (float) $price_te;
+
+ foreach ($this->taxes as $tax) {
+ $tourismTax = TaxConfiguration::getByTaxId((int) $tax->id);
+ if (!$tourismTax) {
+ continue;
+ }
+
+ $hasMultiRanges = (bool) $tourismTax->has_multiple_valid_ranges;
+ $validityRanges = $hasMultiRanges ? TaxValidityRange::getByTaxId((int) $tax->id) : null;
+
+ $specialDays = null;
+ if ($tourismTax->special_days) {
+ $decoded = json_decode($tourismTax->special_days, true);
+ $specialDays = is_array($decoded) ? $decoded : array();
+ }
+
+ $isPerNight = (bool) $tourismTax->per_night;
+
+ if ($isPerNight) {
+ $validNights = 0;
+ for ($i = 0; $i < $numNights; $i++) {
+ $night = clone $checkIn;
+ $night->modify('+' . $i . ' days');
+ if ($hasMultiRanges && !TaxValidityRange::dateMatchesAnyRange($validityRanges, $night)) {
+ continue;
+ }
+ if ($specialDays !== null && !in_array(TaxConfiguration::DAY_KEYS[$night->format('N') - 1], $specialDays)) {
+ continue;
+ }
+ $validNights++;
+ }
+ if ($validNights === 0) {
+ continue;
+ }
+ } else {
+ if ($hasMultiRanges && !TaxValidityRange::dateMatchesAnyRange($validityRanges, $checkIn)) {
+ continue;
+ }
+ if ($specialDays !== null && !in_array(TaxConfiguration::DAY_KEYS[$isoDayIndex], $specialDays)) {
+ continue;
+ }
+ $validNights = $numNights;
+ }
+
+ if ($validNightsByTax !== null) {
+ $validNightsByTax[$tax->id] = $validNights;
+ }
+
+ $taxType = (int) $tourismTax->calculation_type;
+
+ $baseValue = (float) $tourismTax->tax_value;
+ if ($tourismTax->has_tiered_pricing) {
+ $tier = TaxPriceTier::getMatchingTier((int) $tax->id, $runningPriceExcl);
+ if ($tier) {
+ $baseValue = (float) $tier['tax_value'];
+ }
+ }
+
+ $adultMultiplier = 1;
+ if ($isPerNight) {
+ $adultMultiplier *= $validNights;
+ }
+ if ($tourismTax->per_person) {
+ $adultMultiplier *= $numAdults;
+ }
+
+ if ($taxType === TaxConfiguration::CALCULATION_TYPE_FIXED) {
+ $unitAmountAdult = $baseValue;
+ $totalAmountAdult = $baseValue * $adultMultiplier;
+ } else {
+ $unitAmountAdult = $runningPriceExcl * ($baseValue / 100);
+ $totalAmountAdult = $unitAmountAdult * $adultMultiplier;
+ }
+
+ $totalAmountChild = 0.0;
+ if ($tourismTax->apply_on_child && !empty($eligibleChildAges)) {
+ $contribution = TaxChildRange::getChildContribution(
+ $tax->id,
+ $eligibleChildAges,
+ (int) $tourismTax->child_calculation_type,
+ $unitAmountAdult,
+ $tourismTax->has_child_age_range
+ );
+ if ($contribution['count'] > 0) {
+ $nightMultiplier = $isPerNight ? $validNights : 1;
+ $totalAmountChild = $contribution['total'] * $nightMultiplier;
+ }
+ }
+
+ if ($this->computation_method == TaxCalculator::ONE_AFTER_ANOTHER_METHOD) {
+ $runningPriceExcl += $unitAmountAdult;
+ }
+
+ $totalAmountAdult = Tools::convertPrice($totalAmountAdult, $idCurrency);
+ $totalAmountChild = Tools::convertPrice($totalAmountChild, $idCurrency);
+ $taxes_amounts[$tax->id] = Tools::ps_round(($totalAmountAdult + $totalAmountChild) * max(1, $quantity), 6);
+ }
+ }
+
+ foreach ($this->taxes as $tax) {
+ if (in_array($tax->id, $tourismTaxIds)) {
+ continue;
+ }
if (!isset($taxes_amounts[$tax->id])) {
$taxes_amounts[$tax->id] = 0;
}
@@ -155,20 +296,59 @@ class TaxCalculatorCore
}
/**
- * Return the total taxes amount
*
* @param float $price_te
* @return float $amount
*/
- public function getTaxesTotalAmount($price_te)
- {
+ public function getTaxesTotalAmount(
+ $price_te,
+ $checkInDate = null,
+ $numNights = 1,
+ $numAdults = 1,
+ $childrenAges = array(),
+ $collectionType = null,
+ $quantity = 1,
+ $idCurrency = null
+ ) {
$amount = 0;
- $taxes = $this->getTaxesAmount($price_te);
+ $taxes = $this->getTaxesAmount($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity, $idCurrency);
foreach ($taxes as $tax) {
$amount += $tax;
}
return $amount;
}
+
+ /**
+ *
+ * @param float $price_te
+ * @param string $checkInDate
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges
+ * @param int $collectionType
+ * @param int $quantity
+ * @return float price with tourism tax
+ */
+ public function addTourismTaxes($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity = 1)
+ {
+ return $price_te + $this->getTaxesTotalAmount($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity);
+ }
+
+ /**
+ *
+ * @param float $price_ti
+ * @param string $checkInDate 'YYYY-MM-DD'
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges Ages at check-in date
+ * @param int $collectionType HotelBranchInformation::TAX_COLLECTION_TYPE_*
+ * @param int $quantity Line quantity multiplier
+ * @return float price without tourism tax
+ */
+ public function removeTourismTaxes($price_ti, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity = 1)
+ {
+ return $price_ti - $this->getTaxesTotalAmount($price_ti, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity);
+ }
}
diff --git a/classes/tax/TaxChildRange.php b/classes/tax/TaxChildRange.php
new file mode 100644
index 000000000..58d861895
--- /dev/null
+++ b/classes/tax/TaxChildRange.php
@@ -0,0 +1,134 @@
+ 'tax_child_range',
+ 'primary' => 'id_tax_child_range',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'min_age' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'max_age' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ ),
+ );
+
+ /**
+ * All child age ranges for a tax in entry order (id_tax_child_range order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxChildRange::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $ranges = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_child_range` ASC'
+ );
+ Cache::store($cacheId, $ranges);
+
+ return $ranges;
+ }
+
+ /**
+ * Replace all child range rows for $idTax with the submitted arrays, skipping entries where tax_value is empty.
+ *
+ * @param int $idTax
+ * @param array $mins
+ * @param array $maxs
+ * @param array $values
+ * @return void
+ */
+ public static function saveAll($idTax, $mins, $maxs, $values)
+ {
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . (int) $idTax
+ );
+ foreach ($values as $rowIndex => $value) {
+ if ($value === '' || $value === false) {
+ continue;
+ }
+ $range = new TaxChildRange();
+ $range->id_tax = (int) $idTax;
+ $range->min_age = isset($mins[$rowIndex]) ? (int) $mins[$rowIndex] : 0;
+ $range->max_age = isset($maxs[$rowIndex]) ? (int) $maxs[$rowIndex] : 0;
+ $range->tax_value = (float) $value;
+ $range->add();
+ }
+ }
+
+ /**
+ * Sum per-band tax contributions for the given child ages — each child matched to the first qualifying
+ * band (band value interpreted per $childCalcType); unmatched children pay the adult's own already-computed
+ * per-unit tourism tax amount flatly, since they're not governed by any band.
+ *
+ * @param int $idTax
+ * @param int[] $ages Ages at check-in date
+ * @param int $childCalcType 0=fixed, 1=percentage — governs matched-band contributions only
+ * @param float $unitTourismTaxAmountAdult Adult's already-computed per-unit tourism tax amount (tier-aware);
+ * @param bool $useRanges false = skip band lookup, every child is treated as unmatched
+ * @return array ['total' => float, 'count' => int]
+ */
+ public static function getChildContribution($idTax, $ages, $childCalcType, $unitTourismTaxAmountAdult, $useRanges = true)
+ {
+ $ranges = $useRanges ? self::getByTaxId((int) $idTax) : array();
+ $total = 0.0;
+ $count = 0;
+ foreach ($ages as $age) {
+ $age = (int) $age;
+ $matched = false;
+ foreach ($ranges as $range) {
+ $maxAge = (int) $range['max_age'];
+ $inLower = ($age >= (int) $range['min_age']);
+ $inUpper = ($maxAge == 0 || $age <= $maxAge);
+ if ($inLower && $inUpper) {
+ $bandValue = (float) $range['tax_value'];
+ $total += ($childCalcType === TaxConfiguration::CALCULATION_TYPE_FIXED) ? $bandValue : ($unitTourismTaxAmountAdult * ($bandValue / 100));
+ $count++;
+ $matched = true;
+ break;
+ }
+ }
+ if (!$matched) {
+ $total += $unitTourismTaxAmountAdult;
+ $count++;
+ }
+ }
+ return array('total' => $total, 'count' => $count);
+ }
+}
diff --git a/classes/tax/TaxConfiguration.php b/classes/tax/TaxConfiguration.php
new file mode 100644
index 000000000..141761ee9
--- /dev/null
+++ b/classes/tax/TaxConfiguration.php
@@ -0,0 +1,365 @@
+ 'tax_configuration',
+ 'primary' => 'id_tax',
+ 'fields' => array(
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'calculation_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'per_night' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'per_person' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'has_tiered_pricing' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'apply_on_child' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'has_child_age_range' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'child_calculation_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'has_multiple_valid_ranges' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'special_days' => array('type' => self::TYPE_STRING),
+ ),
+ );
+
+ /**
+ * Override add() because id_tax is a FK-as-PK — the base ObjectModel::add() never writes the primary key column, which would default to 0 and create phantom rows.
+ *
+ * @param bool $auto_date ignored — table has no date_add/date_upd
+ * @param bool $null_values ignored
+ * @return bool
+ */
+ public function add($auto_date = true, $null_values = false)
+ {
+ $idTax = (int) $this->id;
+ if (!$idTax) {
+ return false;
+ }
+ $result = Db::getInstance()->insert(
+ 'tax_configuration',
+ array(
+ 'id_tax' => $idTax,
+ 'tax_value' => (float) $this->tax_value,
+ 'calculation_type' => (int) $this->calculation_type,
+ 'per_night' => (int) $this->per_night,
+ 'per_person' => (int) $this->per_person,
+ 'has_tiered_pricing' => (int) $this->has_tiered_pricing,
+ 'apply_on_child' => (int) $this->apply_on_child,
+ 'has_child_age_range' => (int) $this->has_child_age_range,
+ 'child_calculation_type' => (int) $this->child_calculation_type,
+ 'has_multiple_valid_ranges' => (int) $this->has_multiple_valid_ranges,
+ 'special_days' => $this->special_days ? pSQL($this->special_days) : null,
+ )
+ );
+ if ($result) {
+ $this->id_tax = $idTax;
+ }
+ return $result;
+ }
+
+ /**
+ * Load a tourism tax subtype row by id_tax, cached per request.
+ *
+ * @param int $idTax
+ * @return TaxConfiguration|false
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxConfiguration::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $obj = new TaxConfiguration($idTax);
+ $result = Validate::isLoadedObject($obj) ? $obj : false;
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Shared core for cleanFromTourismTaxRulesGroups()/cleanFromVatTaxRulesGroups().
+ *
+ * @param int $idTax
+ * @param bool $isTourismTaxRulesGroup true = clean from tourism tax rules groups, false = clean from VAT tax rules groups
+ * @return int
+ */
+ protected static function cleanTaxRulesGroupsByTourismFlag($idTax, $isTourismTaxRulesGroup)
+ {
+ $flag = $isTourismTaxRulesGroup ? 1 : 0;
+ $db = Db::getInstance();
+ $db->execute(
+ 'DELETE tr FROM `' . _DB_PREFIX_ . 'tax_rule` tr
+ INNER JOIN `' . _DB_PREFIX_ . 'tax_rules_group` trg
+ ON trg.`id_tax_rules_group` = tr.`id_tax_rules_group`
+ WHERE tr.`id_tax` = ' . (int) $idTax . '
+ AND trg.`is_tourism_tax_rule_group` = ' . $flag
+ );
+ return $db->Affected_Rows();
+ }
+
+ /**
+ * Remove this tax from all tourism tax rules groups.
+ *
+ * @param int $idTax
+ * @return int
+ */
+ public static function cleanFromTourismTaxRulesGroups($idTax)
+ {
+ return self::cleanTaxRulesGroupsByTourismFlag($idTax, true);
+ }
+
+ /**
+ * Remove this tax from all standard (non-tourism) tax rules groups — symmetric counterpart of cleanFromTourismTaxRulesGroups().
+ *
+ * @param int $idTax
+ * @return int
+ */
+ public static function cleanFromVatTaxRulesGroups($idTax)
+ {
+ return self::cleanTaxRulesGroupsByTourismFlag($idTax, false);
+ }
+
+ /**
+ * Format a tax rate/amount for display, VAT as a percentage and tourism tax per its own calc type.
+ *
+ * @param mixed $value ps_tax.rate (used for non-tourism rows)
+ * @param array $row List row — must include is_tourism_tax, tourism_tax_calc_type, tourism_tax_value
+ * @param Currency $currency
+ * @return string
+ */
+ public static function getFormattedRateForDisplay($value, $row, $currency)
+ {
+ if (!(int) $row['is_tourism_tax']) {
+ return Tools::safeOutput($value) . '%';
+ }
+ $displayValue = Tools::safeOutput((float) $row['tourism_tax_value']);
+ if ((int) $row['tourism_tax_calc_type'] === self::CALCULATION_TYPE_PERCENTAGE) {
+ return $displayValue . '%';
+ }
+ $currencySign = Tools::safeOutput(trim($currency->prefix . $currency->suffix));
+ return $currencySign . ' ' . $displayValue;
+ }
+
+ /**
+ * Delete the subtype row and all related tiers/child-ranges.
+ *
+ * @return bool
+ */
+ public function delete()
+ {
+ if (parent::delete()) {
+ $idTax = (int) $this->id;
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax
+ );
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Whether tourism tax should be visually folded into the displayed room/service price.
+ *
+ * @param float $tourismTax
+ * @return bool
+ */
+ public static function isGrossedUp($tourismTax)
+ {
+ return (float) $tourismTax > 0 && (bool) Configuration::get('QLO_TOURISM_TAX_GROSSED_UP');
+ }
+
+ /**
+ * Resolve the hotel's own jurisdiction address and current tourism-tax collection type — shared by every cart, order, and preview caller that needs this context.
+ *
+ * @param int $idHotel 0 = no hotel context (fully standalone product)
+ * @param Address $fallbackAddress Used only when the hotel has no address on file
+ * @return array ['address' => Address, 'collectionType' => int]
+ */
+ public static function resolveHotelAddressAndCollectionType($idHotel, $fallbackAddress)
+ {
+ $idHotel = (int) $idHotel;
+
+ $address = null;
+ if ($idHotel) {
+ $hotelAddress = HotelBranchInformation::getAddress($idHotel);
+ if ($hotelAddress && !empty($hotelAddress['id_address'])) {
+ $address = new Address((int) $hotelAddress['id_address']);
+ }
+ }
+ if (!$address || !Validate::isLoadedObject($address)) {
+ $address = $fallbackAddress;
+ }
+
+ $collectionType = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ if ($idHotel && Validate::isLoadedObject($hotelBranch = new HotelBranchInformation($idHotel))) {
+ $collectionType = (int) $hotelBranch->tourism_tax_collection_type;
+ }
+
+ return array(
+ 'address' => $address,
+ 'collectionType' => $collectionType,
+ );
+ }
+
+ /**
+ * Resolve the jurisdiction address, collection type, and occupancy (check-in/nights/adults/children) a service product line needs before computing its tourism tax.
+ *
+ * @param int $idHotel 0 = no hotel context (fully standalone product)
+ * @param int $idHtlBookingDetail 0 = not attached to an order-side room booking
+ * @param Address $fallbackAddress Used only when the hotel has no address on file
+ * @param int $idHtlCartBooking 0 = not attached to a cart-side room booking (pre-order preview only —
+ * ignored when $idHtlBookingDetail is given)
+ * @return array ['address' => Address, 'collectionType' => int, 'checkInDate' => string,
+ * 'numNights' => int, 'numAdults' => int, 'childrenAges' => int[]]
+ */
+ public static function resolveServiceLineTaxContext($idHotel, $idHtlBookingDetail, $fallbackAddress, $idHtlCartBooking = 0)
+ {
+ $idHotel = (int) $idHotel;
+ $idHtlBookingDetail = (int) $idHtlBookingDetail;
+ $idHtlCartBooking = (int) $idHtlCartBooking;
+
+ $hotelContext = self::resolveHotelAddressAndCollectionType($idHotel, $fallbackAddress);
+ $address = $hotelContext['address'];
+ $collectionType = $hotelContext['collectionType'];
+
+ $roomBooking = $idHtlBookingDetail ? new HotelBookingDetail($idHtlBookingDetail) : null;
+ $cartBooking = (!$roomBooking && $idHtlCartBooking) ? new HotelCartBookingData($idHtlCartBooking) : null;
+ if ($roomBooking && Validate::isLoadedObject($roomBooking)) {
+ $checkInDate = $roomBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($roomBooking->date_from, $roomBooking->date_to));
+ $numAdults = (int) $roomBooking->adults;
+ $childrenAges = array();
+ if ($roomBooking->child_ages) {
+ $decoded = json_decode($roomBooking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+ } elseif ($cartBooking && Validate::isLoadedObject($cartBooking)) {
+ $checkInDate = $cartBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($cartBooking->date_from, $cartBooking->date_to));
+ $numAdults = (int) $cartBooking->adults;
+ $childrenAges = !empty($cartBooking->child_ages) ? (array) json_decode($cartBooking->child_ages, true) : array();
+ } else {
+ $checkInDate = date('Y-m-d');
+ $numNights = 1;
+ $numAdults = 1;
+ $childrenAges = array();
+ }
+
+ return array(
+ 'address' => $address,
+ 'collectionType' => $collectionType,
+ 'checkInDate' => $checkInDate,
+ 'numNights' => $numNights,
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges,
+ );
+ }
+
+ /**
+ * Preview parameters for a tax rules group — a deliberate 1-adult/1-night approximation for js/admin/price.js's live price preview.
+ *
+ * @param int $idTaxRulesGroup
+ * @param Address $address
+ * @param int $idLang
+ * @return array List of ['tax_calc_type','is_tiered','tax_value','tiers']
+ */
+ public static function getPreviewParams($idTaxRulesGroup, $address, $idLang, $collectionType = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE)
+ {
+ $idTaxRulesGroup = (int) $idTaxRulesGroup;
+ if (!$idTaxRulesGroup || Tax::excludeTaxeOption() || (int) $collectionType === HotelBranchInformation::TAX_COLLECTION_TYPE_AT_HOTEL) {
+ return array();
+ }
+
+ $taxCalculator = TaxManagerFactory::getManager($address, $idTaxRulesGroup)->getTaxCalculator();
+ $preview = array();
+
+ $today = new DateTime(date('Y-m-d'));
+ $todayDayKey = self::DAY_KEYS[$today->format('N') - 1];
+
+ foreach ($taxCalculator->taxes as $tax) {
+ $tourismTax = self::getByTaxId((int) $tax->id);
+ if (!$tourismTax) {
+ continue;
+ }
+
+ if ((bool) $tourismTax->has_multiple_valid_ranges
+ && !TaxValidityRange::dateMatchesAnyRange(TaxValidityRange::getByTaxId((int) $tax->id), $today)
+ ) {
+ continue;
+ }
+ if ($tourismTax->special_days) {
+ $specialDays = json_decode($tourismTax->special_days, true);
+ if (!is_array($specialDays) || !in_array($todayDayKey, $specialDays)) {
+ continue;
+ }
+ }
+
+ $tiers = array();
+ if ((bool) $tourismTax->has_tiered_pricing) {
+ foreach (TaxPriceTier::getByTaxId((int) $tax->id) as $tier) {
+ $tiers[] = array(
+ 'min_amount' => (float) $tier['min_amount'],
+ 'max_amount' => (float) $tier['max_amount'],
+ 'tax_value' => (float) $tier['tax_value'],
+ );
+ }
+ }
+ $preview[] = array(
+ 'tax_calc_type' => (int) $tourismTax->calculation_type,
+ 'is_tiered' => (bool) $tourismTax->has_tiered_pricing,
+ 'tax_value' => (float) $tourismTax->tax_value,
+ 'tiers' => $tiers,
+ );
+ }
+
+ return $preview;
+ }
+}
diff --git a/classes/tax/TaxPriceTier.php b/classes/tax/TaxPriceTier.php
new file mode 100644
index 000000000..49550c496
--- /dev/null
+++ b/classes/tax/TaxPriceTier.php
@@ -0,0 +1,116 @@
+ 'tax_price_tier',
+ 'primary' => 'id_tax_price_tier',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'min_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'max_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ ),
+ );
+
+ /**
+ * All tiers for a tax in entry order (id_tax_price_tier order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxPriceTier::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $tiers = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_price_tier` ASC'
+ );
+ Cache::store($cacheId, $tiers);
+
+ return $tiers;
+ }
+
+ /**
+ * Find the matching tier for a given unit price, or false when no tier matches.
+ *
+ * @param int $idTax
+ * @param float $unitPrice
+ * @return array|false
+ */
+ public static function getMatchingTier($idTax, $unitPrice)
+ {
+ $tiers = self::getByTaxId($idTax);
+ foreach ($tiers as $tier) {
+ $maxAmount = (float) $tier['max_amount'];
+ $inLower = ($unitPrice >= (float) $tier['min_amount']);
+ $inUpper = ($maxAmount == 0 || $unitPrice <= $maxAmount);
+ if ($inLower && $inUpper) {
+ return $tier;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Replace all tier rows for $idTax with the submitted arrays, skipping entries where tax_value is empty.
+ *
+ * @param int $idTax
+ * @param array $mins
+ * @param array $maxs
+ * @param array $values
+ * @return void
+ */
+ public static function saveAll($idTax, $mins, $maxs, $values)
+ {
+ $idTax = (int) $idTax;
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax
+ );
+ foreach ($values as $rowIndex => $value) {
+ if ($value === '' || $value === false) {
+ continue;
+ }
+ $tier = new TaxPriceTier();
+ $tier->id_tax = $idTax;
+ $tier->min_amount = isset($mins[$rowIndex]) ? (float) $mins[$rowIndex] : 0;
+ $tier->max_amount = isset($maxs[$rowIndex]) ? (float) $maxs[$rowIndex] : 0;
+ $tier->tax_value = (float) $value;
+ $tier->add();
+ }
+ }
+}
diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index c37d6367a..bf62813a7 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -40,6 +40,9 @@ class TaxRulesGroupCore extends ObjectModel
/** @var string Object last modification date */
public $date_upd;
+ /** @var int 1 = all rules in this TRG reference tourism taxes only */
+ public $is_tourism_tax_rule_group = 0;
+
/**
* @see ObjectModel::$definition
*/
@@ -47,11 +50,12 @@ class TaxRulesGroupCore extends ObjectModel
'table' => 'tax_rules_group',
'primary' => 'id_tax_rules_group',
'fields' => array(
- 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
- 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
- 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
- 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
- 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'is_tourism_tax_rule_group' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
),
);
@@ -139,23 +143,31 @@ class TaxRulesGroupCore extends ObjectModel
return false;
}
- public static function getTaxRulesGroups($only_active = true)
+ /**
+ * @param bool $only_active
+ * @param bool $isTourismTax true = return only tourism TRGs; false (default) = return standard TRGs
+ * @return array
+ */
+ public static function getTaxRulesGroups($only_active = true, $isTourismTax = false)
{
return Db::getInstance()->executeS('
SELECT DISTINCT g.id_tax_rules_group, g.name, g.active
FROM `'._DB_PREFIX_.'tax_rules_group` g'
- .Shop::addSqlAssociation('tax_rules_group', 'g').' WHERE deleted = 0'
+ .Shop::addSqlAssociation('tax_rules_group', 'g').' WHERE deleted = 0
+ AND g.`is_tourism_tax_rule_group` = '.($isTourismTax ? 1 : 0)
.($only_active ? ' AND g.`active` = 1' : '').'
ORDER BY name ASC');
}
/**
- * @return array an array of tax rules group formatted as $id => $name
- */
- public static function getTaxRulesGroupsForOptions()
+ * @param bool $onlyActive
+ * @param bool $isTourismTax true = tourism TRG list with "None" placeholder; false (default) = standard TRG list with "No tax" placeholder
+ * @return array
+ */
+ public static function getTaxRulesGroupsForOptions($onlyActive = true, $isTourismTax = false)
{
- $tax_rules[] = array('id_tax_rules_group' => 0, 'name' => Tools::displayError('No tax'));
- return array_merge($tax_rules, TaxRulesGroup::getTaxRulesGroups());
+ $tax_rules[] = array('id_tax_rules_group' => 0, 'name' => Tools::displayError('No Tax'));
+ return array_merge($tax_rules, TaxRulesGroup::getTaxRulesGroups($onlyActive, $isTourismTax));
}
public function delete()
@@ -222,6 +234,61 @@ class TaxRulesGroupCore extends ObjectModel
);
}
+ /**
+ * @return bool true if any of this group's tax rules reference a tourism tax
+ */
+ public function hasTourismTaxRules()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT tr.`id_tax_rule` FROM `'._DB_PREFIX_.'tax_rule` tr
+ INNER JOIN `'._DB_PREFIX_.'tax` t ON t.`id_tax` = tr.`id_tax`
+ WHERE tr.`id_tax_rules_group` = '.(int) $this->id.'
+ AND t.`is_tourism_tax` = 1'
+ );
+ }
+
+ /**
+ * @return bool true if any product currently uses this group as its tourism tax rule
+ */
+ public function hasProductsUsingAsTourismGroup()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_product` FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_tourism_tax_rules_group` = '.(int) $this->id
+ );
+ }
+
+ /**
+ * @return bool true if any of this group's tax rules reference a non-tourism (VAT) tax
+ */
+ public function hasVatTaxRules()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT tr.`id_tax_rule` FROM `'._DB_PREFIX_.'tax_rule` tr
+ INNER JOIN `'._DB_PREFIX_.'tax` t ON t.`id_tax` = tr.`id_tax`
+ WHERE tr.`id_tax_rules_group` = '.(int) $this->id.'
+ AND tr.`id_tax` != 0
+ AND t.`is_tourism_tax` = 0'
+ );
+ }
+
+ /**
+ * @return bool true if any product or service price currently uses this group as its regular (VAT) tax rule
+ */
+ public function hasProductsUsingAsVatGroup()
+ {
+ $hasRegularProductConflict = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_product` FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_tax_rules_group` = '.(int) $this->id
+ );
+ $hasServicePriceConflict = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_room_type_service_product_price` FROM `'._DB_PREFIX_.'htl_room_type_service_product_price`
+ WHERE `id_tax_rules_group` = '.(int) $this->id
+ );
+
+ return (bool) ($hasRegularProductConflict || $hasServicePriceConflict);
+ }
+
/**
* @deprecated since 1.5
*/
diff --git a/classes/tax/TaxValidityRange.php b/classes/tax/TaxValidityRange.php
new file mode 100644
index 000000000..91aa3dc0c
--- /dev/null
+++ b/classes/tax/TaxValidityRange.php
@@ -0,0 +1,113 @@
+ 'tax_validity_range',
+ 'primary' => 'id_tax_validity_range',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'valid_from' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'allow_null' => true),
+ 'valid_to' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'allow_null' => true),
+ ),
+ );
+
+ /**
+ * All validity ranges for a tax in entry order (id_tax_validity_range order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxValidityRange::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $ranges = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_validity_range` ASC'
+ );
+ Cache::store($cacheId, $ranges);
+
+ return $ranges;
+ }
+
+ /**
+ * Whether $date falls within any of the given ranges (OR across rows) — a blank bound on either
+ * @param array $ranges Rows as returned by getByTaxId()
+ * @param DateTime $date
+ * @return bool
+ */
+ public static function dateMatchesAnyRange($ranges, $date)
+ {
+ if (empty($ranges)) {
+ return true;
+ }
+ foreach ($ranges as $range) {
+ $from = (!empty($range['valid_from']) && $range['valid_from'] !== '0000-00-00') ? new DateTime($range['valid_from']) : null;
+ $to = (!empty($range['valid_to']) && $range['valid_to'] !== '0000-00-00') ? new DateTime($range['valid_to']) : null;
+ if ((!$from || $date >= $from) && (!$to || $date <= $to)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Replace all validity-range rows for $idTax with the submitted arrays, skipping rows where
+ * @param int $idTax
+ * @param array $froms
+ * @param array $tos
+ * @return void
+ */
+ public static function saveAll($idTax, $froms, $tos)
+ {
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ foreach ($froms as $rowIndex => $from) {
+ $to = isset($tos[$rowIndex]) ? $tos[$rowIndex] : '';
+ $fromEmpty = ($from === '' || $from === false);
+ $toEmpty = ($to === '' || $to === false);
+ if ($fromEmpty && $toEmpty) {
+ continue;
+ }
+ $range = new TaxValidityRange();
+ $range->id_tax = $idTax;
+ $range->valid_from = $fromEmpty ? null : $from;
+ $range->valid_to = $toEmpty ? null : $to;
+ $range->add();
+ }
+ }
+}
diff --git a/classes/webservice/WebserviceOrder.php b/classes/webservice/WebserviceOrder.php
index 9fedace95..ac47fb3fb 100644
--- a/classes/webservice/WebserviceOrder.php
+++ b/classes/webservice/WebserviceOrder.php
@@ -31,5 +31,6 @@ class WebserviceOrderCore extends PaymentModule
$this->displayName = $this->l('Order from API');
$this->validateOrderAmount = false;
$this->payment_type = OrderPayment::PAYMENT_TYPE_ONLINE;
+ $this->idBookingSource = Source::getIdByCode('API_ORDER');
}
}
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 19763851a..54327aa11 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -144,16 +144,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'total_tax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice')
)
- ),
- 'facilities' => array(
- 'resource' => 'facility',
- 'fields' => array(
- 'id_facility' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- 'id_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isString'),
- 'unit_price_without_tax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'),
- 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- )
)
)
)
@@ -273,7 +263,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$parentKeys = array(
'room_types' => 'room_type',
'rooms' => 'room',
- 'facilities' => 'facility',
'services' => 'service',
'cart_rules' => 'cart_rule',
'remarks' => 'remark',
@@ -504,10 +493,8 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
if (count($rooms)) {
$formattedRooms = array();
foreach ($rooms as $roomKey => $room) {
- $selectedDemands = $this->formatDemandsInRequestData($room);
$selectedServices = $this->formatServicesInRequestData($room);
$occupancy = $this->formatOccupancyInRequestData($room, $data['id_room_type']);
- $rooms[$roomKey]['facilities'] = $selectedDemands;
$rooms[$roomKey]['services'] = $selectedServices;
$rooms[$roomKey]['occupancy'] = $occupancy;
$key = $roomKey;
@@ -516,7 +503,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$formattedRooms[$key] = $room;
- $formattedRooms[$key]['facilities'] = $selectedDemands;
$formattedRooms[$key]['services'] = $selectedServices;
$formattedRooms[$key]['occupancy'] = $occupancy;
if (isset($room['id_tax_rules_group'])) {
@@ -609,36 +595,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return $formattedServices;
}
- public function formatDemandsInRequestData($data)
- {
- $selectedDemands = array();
- if (isset($data['facilities']['facility'][0])) {
- $selectedDemands = $data['facilities']['facility'];
- } else if (isset($data['facilities'])
- && !isset($data['facilities'][0])
- && isset($data['facilities']['facility'])
- ) {
- $selectedDemands[] = $data['facilities']['facility'];
- } else if (isset($data['facilities']) && isset($data['facilities'][0])) {
- $selectedDemands = $data['facilities'];
- }
-
- $formattedDemands = array();
- foreach ($selectedDemands as $key => $demand) {
- $formattedDemands[$key]['id_global_demand'] = isset($demand['id_facility']) ? $demand['id_facility'] : 0;
- $formattedDemands[$key]['id_option'] = isset($demand['id_option']) ? $demand['id_option'] : 0;
- if (isset($demand['unit_price_without_tax'])) {
- $formattedDemands[$key]['unit_price_without_tax'] = $demand['unit_price_without_tax'];
- }
-
- if (isset($demand['id_tax_rules_group'])) {
- $formattedDemands[$key]['id_tax_rules_group'] = $demand['id_tax_rules_group'];
- }
- }
-
- return $formattedDemands;
- }
-
/**
* Validating the POST request.
*/
@@ -823,11 +779,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return false;
}
- if (isset($room['facilities']) && $room['facilities']
- && !$this->validateRequestedDemands($room['facilities'], $roomType['id_room_type'])
- ) {
- return false;
- }
}
}
} else {
@@ -973,7 +924,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
null,
false
)) {
- $this->updateServicesAndDemandsInOrder($objPaymentModule->currentOrder);
+ $this->updateServicesInOrder($objPaymentModule->currentOrder);
if (!empty($this->wsRequestedRooms)) {
$this->updateRoomTaxRulesGroupsInOrder($objPaymentModule->currentOrder);
}
@@ -1015,7 +966,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->addCartRulesToOrder(array($cartRule), $objOrder->id);
} else if ($params['price_details']['total_price_with_tax'] > $objOrder->total_paid_tax_incl) {
$objHotelBookingDetail = new HotelBookingDetail();
- $objHotelBookingDemands = new HotelBookingDemands();
if ($roomsInOrder = $objHotelBookingDetail->getOrderCurrentDataByOrderId($idOrder)) {
$requestedPrice = $params['price_details']['total_price_with_tax'];
$roomsToUpdate = array();
@@ -1030,12 +980,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$serviceProductPrice = $objOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
- if ($demands = $objHotelBookingDemands->getExtraDemandsTaxesDetails($objOrder->id)) {
- $demandsPrice = array_sum(array_column($demands, 'total_price_tax_excl'));
- // Adding the tax
- $demandsPrice += array_sum(array_column($demands, 'total_amount'));
- $serviceProductPrice += $demandsPrice;
- }
$requestedPrice -= $serviceProductPrice;
// This empty means that all the rooms are sent with price in the request, so we will add a service to a room to manage the order total sent in the request.
@@ -1105,7 +1049,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRooms[$dateRoomJoinKey]['total_tax']/$objHotelBookingDetail->total_price_tax_excl)*100, $objAddress);
} else if (isset($this->wsRequestedRooms[$dateRoomJoinKey]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$priceWithTax = $objHotelBookingDetail->total_price_tax_excl + $this->wsRequestedRooms[$dateRoomJoinKey]['total_tax'];
}
@@ -1134,7 +1082,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objOrderDetail->save();
if (isset($this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'], (int) $objHotelBookingDetail->id, 0);
}
$objOrder->total_paid += $taxDiff;
$objOrder->total_paid_tax_incl += $taxDiff;
@@ -1146,17 +1094,22 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
}
- public function saveTaxCalculator($idOrderDetail, $idTaxRulesGroup)
+ public function saveTaxCalculator($idOrderDetail, $idTaxRulesGroup, $idHtlBooking = 0, $idServiceProductOrderDetail = 0)
{
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$idOrderDetail);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$idOrderDetail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$idTax = $this->wsTaxRulesGroup[$idTaxRulesGroup]['tax'];
$objOrderDetail = new OrderDetail($idOrderDetail);
- $values = '('.(int)$objOrderDetail->id.','.(int)$idTax.','.
+ $values = '('.(int)$objOrderDetail->id_order.','.(int)$objOrderDetail->id.','.(int)$idHtlBooking.','.(int)$idServiceProductOrderDetail.','.(int)$idTax.','.
(float)($objOrderDetail->unit_price_tax_incl - $objOrderDetail->unit_price_tax_excl).','.
- (float)($objOrderDetail->total_price_tax_incl - $objOrderDetail->total_price_tax_excl).'),';
+ (float)($objOrderDetail->total_price_tax_incl - $objOrderDetail->total_price_tax_excl).',NOW()),';
$values = rtrim($values, ',');
- $sql = 'INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (id_order_detail, id_tax, unit_amount, total_amount)
+ $sql = 'INSERT INTO `'._DB_PREFIX_.'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
VALUES '.$values;
return Db::getInstance()->execute($sql);
@@ -1165,7 +1118,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
/**
* Updating the services and their prices.
*/
- public function updateServicesAndDemandsInOrder($idOrder)
+ public function updateServicesInOrder($idOrder)
{
$objOrder = new Order($idOrder);
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
@@ -1267,7 +1220,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax']/$objServiceProductOrderDetail->total_price_tax_excl)*100, $objAddress);
} else if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $objServiceProductOrderDetail->total_price_tax_excl + $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'];
$priceDiffTaxIncl = $unitPriceTaxIncl - $objServiceProductOrderDetail->total_price_tax_incl;
@@ -1296,27 +1253,17 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objServiceProductOrderDetail->save();
$objOrderDetail->save();
if (!$isAutoAdded && isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
}
}
- // To save the changes made till now, since we are again loading this order while adding demands if any.
+ // To save the changes made till now, since we are again loading this order while adding if any.
$objOrder->save();
}
$objHotelBookingDetail = new HotelBookingDetail();
- if ($orderedRooms = $objHotelBookingDetail->getOrderCurrentDataByOrderId($objOrder->id)) {
- foreach ($orderedRooms as $orderedRoom) {
- $dateRoomJoinKey = strtotime($orderedRoom['date_from']).''.strtotime($orderedRoom['date_to']).$orderedRoom['id_room'];
- if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) && $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) {
- if ($demands = json_decode($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'], true)) {
- $this->addDemandsInOrderedRoom($demands, $orderedRoom['id']);
- }
- }
- }
- }
}
}
@@ -1626,47 +1573,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return true;
}
- /**
- * Validating the demands related information.
- */
- public function validateRequestedDemands($requestedDemands, $idRoomType)
- {
- $objHotelRoomTypeDemand = new HotelRoomTypeDemand();
- $objHotelDemandOptions = new HotelRoomTypeGlobalDemandAdvanceOption();
- // Incase the there is no demand for this room but demands are still sent in the request for this room type.
- if ($roomTypeDemands = $objHotelRoomTypeDemand->getRoomTypeDemands($idRoomType)) {
- foreach ($requestedDemands as $demandKey => $requestedDemand) {
- if (!isset($requestedDemand['id_global_demand'])
- || !isset($roomTypeDemands[$requestedDemand['id_global_demand']])
- ) {
- $this->error_msg = Tools::displayError('Invalid request for facilities.');
- return false;
- } else if (isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'])
- && (!isset($requestedDemand['id_option']))
- ) {
- $this->error_msg = sprintf(Tools::displayError('Id option is required for the facility with ID %s.'), $requestedDemand['id_global_demand']);
- return false;
- } else if (isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'])
- && !isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'][$requestedDemand['id_option']])
- ) {
- $this->error_msg = sprintf(Tools::displayError('Invalid id option for the facility with ID %s.'), $requestedDemand['id_global_demand']);
- return false;
- } else if (isset($requestedDemand['id_tax_rules_group']) && !Validate::isLoadedObject(new TaxRulesGroup((int) $requestedDemand['id_tax_rules_group']))) {
- $this->error_msg = Tools::displayError('Invalid id_tax_rules_group for facilities.');
- return false;
- } else if (isset($requestedDemand['total_tax']) && !Validate::isPrice($requestedDemand['total_tax'])) {
- $this->error_msg = Tools::displayError('Invalid tax for facilities.');
- return false;
- }
- }
- } else {
- $this->error_msg = Tools::displayError('Invalid request for facilities.');
- return false;
- }
-
- return true;
- }
-
/**
* Adding rooms in the cart.
*/
@@ -1719,7 +1625,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
// since we cannot update them after ordering them and will have to replace them if orderd here. So, we will not add them for now.
- $roomDemands = json_encode(array());
if (isset($room['occupancy']) && count($room['occupancy'])) {
$occupancy = $room['occupancy'];
@@ -1742,7 +1647,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$idRoom,
$dateFrom,
$dateTo,
- $roomDemands,
$roomServices,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -1750,14 +1654,8 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objCartBookingData = new HotelCartBookingData((int) $idHtlCartBookingData);
$dateRoomJoinKey = strtotime($dateFrom).strtotime($dateTo).$objCartBookingData->id_room;
// To update the price after valiate order is called.
- if (isset($room['facilities'])
- && $room['facilities']
- ) {
- $roomDemands = json_encode($room['facilities']);
- }
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'] = $roomServices;
- $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'] = $roomDemands;
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['room'] = $room;
if (isset($room['id_tax_rules_group']) && Validate::isLoadedObject(new TaxRulesGroup((int) $room['id_tax_rules_group']))) {
$this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'] = $room['id_tax_rules_group'];
@@ -1795,7 +1693,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$roomWiseOccupancy = count($roomWiseOccupancy);
}
- $roomDemands = json_encode(array());
$roomServices = array();
$objHotelCartBookingData->updateCartBooking(
$roomType['id_room_type'],
@@ -1805,7 +1702,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
0,
$dateFrom,
$dateTo,
- $roomDemands,
$roomServices,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -2031,7 +1927,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
// Update the information for the services that were updated in the existing rooms
if (count($roomsToUpdate)) {
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
- $objBookingDemand = new HotelBookingDemands();
foreach ($roomsToUpdate as $roomsByDate) {
if (isset($roomsByDate['requested'])
&& $roomsByDate['requested']
@@ -2080,18 +1975,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$this->addServicesInOrderedRoom($room['services'], $idHotelBookingDetail);
- // Since we don't store the id_global_demand in the order, we will remove the previous ones and add the new ones.
- $requestedDemands = $room['facilities'];
- $roomExtraDemand = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 0
- );
- $this->removeDemandsInOrderedRoom($roomExtraDemand);
- $this->addDemandsInOrderedRoom($requestedDemands, $idHotelBookingDetail);
}
} else if (isset($roomsByDate['order'])
&& $roomsByDate['order']
@@ -2375,7 +2258,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax']/$totalPriceTaxExcl)*100, $objAddress);
} else if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $objServiceProductOrderDetail->total_price_tax_excl + $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'];
$priceDiffTaxIncl = $unitPriceTaxIncl - $objServiceProductOrderDetail->total_price_tax_incl;
}
@@ -2434,19 +2321,13 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
if (!$isAutoAdded && isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
$objOrder->save();
}
-
- if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) && $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) {
- if ($demands = json_decode($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'], true)) {
- $this->addDemandsInOrderedRoom($demands, $objBookingDetail->id);
- }
- }
}
}
}
@@ -2580,7 +2461,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
public function removeRoomLineFromOrder($params, $roomsToRemove)
{
$objOrder = new Order((int) $params['id']);
- $objBookingDemand = new HotelBookingDemands();
$objHotelBookingDetail = new HotelBookingDetail();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
foreach ($roomsToRemove as $roomType) {
@@ -2592,26 +2472,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$idHotel = $roomType['id_hotel'];
$bookingPriceTaxIncl = $roomType['total_price_tax_incl'];
$bookingPriceTaxExcl = $roomType['total_price_tax_excl'];
- $roomExtraDemandTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $roomType['id_product'],
- $roomType['id_room'],
- $dateFrom,
- $dateTo,
- 0,
- 1,
- 1
- );
- $roomExtraDemandTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $roomType['id_product'],
- $roomType['id_room'],
- $dateFrom,
- $dateTo,
- 0,
- 1,
- 0
- );
$additionlServicesTI = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -2691,9 +2551,9 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
// Update Order
// values changes as values are calculated accoding to the quantity of the product by webkul
- $objOrder->total_paid = Tools::ps_round($objOrder->total_paid - ($diffProductsTaxIncl + $roomExtraDemandTI + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
- $objOrder->total_paid_tax_incl = Tools::ps_round($objOrder->total_paid_tax_incl - ($diffProductsTaxIncl + $roomExtraDemandTI + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
- $objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->total_paid_tax_excl - ($diffProductsTaxExcl + $roomExtraDemandTE + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid = Tools::ps_round($objOrder->total_paid - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid_tax_incl = Tools::ps_round($objOrder->total_paid_tax_incl - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->total_paid_tax_excl - ($diffProductsTaxExcl + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products = Tools::ps_round($objOrder->total_products - ($diffProductsTaxExcl + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products_wt = Tools::ps_round($objOrder->total_products_wt - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
@@ -2725,8 +2585,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$objOrder->update();
- // delete the demands of this booking
- $objBookingDemand->deleteBookingDemands($idHotelBooking);
$objServiceProductOrderDetail->deleteSeviceProducts(0, $idHotelBooking);
$objHotelCartBookingData = new HotelCartBookingData();
$objHotelCartBookingData->deleteOrderedRoomFromCart(
@@ -2967,12 +2825,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return false;
}
- if (isset($room['facilities']) && $room['facilities']
- && !$this->validateRequestedDemands($room['facilities'], $roomType['id_room_type'])
- ) {
- return false;
- }
-
if (isset($room['id_tax_rules_group']) && !Validate::isLoadedObject(new TaxRulesGroup((int) $room['id_tax_rules_group']))) {
$this->error_msg = Tools::displayError('Invalid id_tax_rules_group.');
return false;
@@ -3340,7 +3192,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$unitPriceTaxIncl = Tools::ps_round($totalPriceTaxIncl / $quantity, _PS_PRICE_COMPUTE_PRECISION_);
} else if (isset($services[$product['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $unitPriceTaxExcl + $services[$product['id_product']]['total_tax'];
$totalPriceTaxIncl = Tools::ps_round(($unitPriceTaxIncl * $quantity), _PS_PRICE_COMPUTE_PRECISION_);
}
@@ -3393,7 +3249,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objOrderDetail->update();
if (!$isAutoAdded && isset($services[$product['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $services[$product['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $services[$product['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
}
@@ -3406,117 +3262,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
}
- /**
- * Adding the demands into the order.
- */
- public function addDemandsInOrderedRoom($demands, $idHotelBooking)
- {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail((int) $idHotelBooking))) {
- if ($demands) {
- $objOrder = new Order($objBookingDetail->id_order);
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($objOrder->id_currency);
-
- $objAddress = new Address((int) $objOrder->id_address_tax);
- $idLang = (int) $objOrder->id_lang;
- $idProduct = $objBookingDetail->id_product;
- $objHtlBkDtl = new HotelBookingDetail();
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($demands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $idHotelBooking;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
-
- $unitPriceTaxExcl = HotelRoomTypeDemand::getPriceStatic($idProduct, $idGlobalDemand, $idOption, 0);
- $unitPriceTaxIncl = HotelRoomTypeDemand::getPriceStatic($idProduct, $idGlobalDemand, $idOption, 1);
- $taxMultiplier = 1;
- if ($unitPriceTaxExcl > 0) {
- $taxMultiplier = $unitPriceTaxIncl / $unitPriceTaxExcl;
- }
-
- $qty = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- if ($numDays > 1) {
- $qty *= $numDays;
- }
- }
-
- $totalPriceTaxExcl = $unitPriceTaxExcl * $qty;
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- if (isset($demand['unit_price_without_tax'])) {
- $unitPriceTaxExcl = $demand['unit_price_without_tax'];
- $unitPriceTaxIncl = $demand['unit_price_without_tax'] * $taxMultiplier;
- $totalPriceTaxExcl = $unitPriceTaxExcl * $qty;
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- }
-
- if (isset($demand['id_tax_rules_group'])) {
- $objTaxManager = TaxManagerFactory::getManager(
- $objAddress,
- $demand['id_tax_rules_group']
- );
- $objTaxManager = TaxManagerFactory::getManager($objAddress, $demand['id_tax_rules_group']);
- $objTaxCalculator = $objTaxManager->getTaxCalculator();
-
- $unitPriceTaxIncl = $objTaxCalculator->addTaxes($unitPriceTaxExcl);
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- } else {
- $objTaxManager = TaxManagerFactory::getManager(
- $objAddress,
- $objGlobalDemand->id_tax_rules_group
- );
- $objTaxCalculator = $objTaxManager->getTaxCalculator();
- }
-
- $objBookingDemand->unit_price_tax_excl = $unitPriceTaxExcl;
- $objBookingDemand->unit_price_tax_incl = $unitPriceTaxIncl;
- $objBookingDemand->total_price_tax_excl = $totalPriceTaxExcl;
- $objBookingDemand->total_price_tax_incl = $totalPriceTaxIncl;
- $objOrderDetail = new OrderDetail($objBookingDetail->id_order_detail);
-
- // Update OrderInvoice of this OrderDetail
- if ($objOrderDetail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $objOrderInvoice = new OrderInvoice($objOrderDetail->id_order_invoice);
- $objOrderInvoice->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
- $objOrderInvoice->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
- $objOrderInvoice->update();
- }
-
- // change order total
- $objOrder->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
- $objOrder->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
- $objOrder->total_paid += $objBookingDemand->total_price_tax_incl;
- $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method;
- $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group;
- if ($objBookingDemand->save()
- && Validate::isLoadedObject($objAddress)
- ) {
- $objBookingDemand->tax_computation_method = (int)$objTaxCalculator->computation_method;
- $objBookingDemand->tax_calculator = $objTaxCalculator;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
-
- $objOrder->save();
- }
- }
- }
-
/**
* Deleting the demands into the order.
*/
@@ -3555,7 +3300,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
- private function manageBookingFilter($filters)
+ private function manageBookingFilter($filters)
{
$ret = '';
$allowedFilters = $this->allowedFilters;
@@ -4072,7 +3817,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
} else {
$objCurrency = new Currency($objOrder->id_currency);
$objBookingDetail = new HotelBookingDetail();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$objOrderReturn = new OrderReturn();
$idHotel = HotelBookingDetail::getIdHotelByIdOrder($objOrder->id);
@@ -4154,35 +3898,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$roomInfo['child'] = (int) $orderData['children'];
$roomInfo['unit_price_without_tax'] = Tools::ps_round($orderData['total_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_);
$roomInfo['total_tax'] = Tools::ps_round(($orderData['total_price_tax_incl'] - $orderData['total_price_tax_excl']), _PS_PRICE_COMPUTE_PRECISION_);
- if(isset($roomInfo['facilities'])) {
- unset($roomInfo['facilities']);
- }
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $orderData['id_order'],
- $orderData['id_product'],
- $orderData['id_room'],
- $orderData['date_from'],
- $orderData['date_to'],
- 0,
- 0,
- $useTax
- )) {
- $roomInfo['facilities'] = array();
- foreach ($extraDemands as $extraDemand) {
- $demand = array();
- $demand['name'] = $extraDemand['name'];
- $demand['quantity'] = 1;
- $demand['unit_price_without_tax'] = Tools::ps_round($extraDemand['unit_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_);
- $demand['total_tax'] = Tools::ps_round(($extraDemand['unit_price_tax_incl']- $extraDemand['unit_price_tax_excl']), _PS_PRICE_COMPUTE_PRECISION_);
-
- $demand['per_night'] = 0;
- if ($extraDemand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $demand['per_night'] = 1;
- }
-
- $roomInfo['facilities'][] = $demand;
- }
- }
if(isset($roomInfo['services'])) {
unset($roomInfo['services']);
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 9a0bac0bc..cbcb74c41 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1057,7 +1057,7 @@ class AdminCartsControllerCore extends AdminController
if ($bookingInfo['id'] == $id_booking_data) {
$amt_with_qty = $bookingInfo['amt_with_qty'];
$bookingInfo['amt_with_qty'] = Tools::displayPrice($amt_with_qty);
- $bookingInfo['total_price'] = Tools::displayPrice($amt_with_qty + $bookingInfo['demand_price'] + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
+ $bookingInfo['total_price'] = Tools::displayPrice($amt_with_qty + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
$response = array(
'curr_booking_info' => $bookingInfo,
'cart_info' => $this->ajaxReturnVars(),
@@ -1130,7 +1130,7 @@ class AdminCartsControllerCore extends AdminController
if ($bookingInfo['id'] == $idBookingData) {
$amtWithQty = $bookingInfo['amt_with_qty'];
$bookingInfo['amt_with_qty'] = Tools::displayPrice($amtWithQty);
- $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['demand_price'] + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
+ $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
$response = array(
'curr_booking_info' => $bookingInfo,
'cart_info' => $this->ajaxReturnVars(),
@@ -1154,8 +1154,8 @@ class AdminCartsControllerCore extends AdminController
}
}
- // Process to get extra demands of any room while order creation process form.tpl
- public function ajaxProcessGetRoomTypeCartDemands()
+ // Process to get extra services of any room while order creation process form.tpl
+ public function ajaxProcessGetRoomTypeCartServices()
{
$response['hasError'] = false;
$response['errors'] = [];
@@ -1167,38 +1167,6 @@ class AdminCartsControllerCore extends AdminController
&& ($idHotelCartBooking = Tools::getValue('id_hotel_cart_booking'))
) {
$objCartBookingData = new HotelCartBookingData();
- if ($selectedRoomDemands = $objCartBookingData->getCartExtraDemands(
- $idCart,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo
- )) {
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- foreach ($selectedRoomDemands as &$selectedDemand) {
- $objRoom = new HotelRoomInformation($selectedDemand['id_room']);
- $selectedDemand['room_num'] = $objRoom->room_num;
- if (isset($selectedDemand['extra_demands']) && $selectedDemand['extra_demands']) {
- $extraDmd = array();
- foreach ($selectedDemand['extra_demands'] as $sDemand) {
- $selectedDemand['selected_global_demands'][] = $sDemand['id_global_demand'];
- $extraDmd[$sDemand['id_global_demand'].'-'.$sDemand['id_option']] = $sDemand;
- }
- $selectedDemand['extra_demands'] = $extraDmd;
- }
- }
- $this->context->smarty->assign('roomTypeDemands', $roomTypeDemands);
- $this->context->smarty->assign('selectedRoomDemands', $selectedRoomDemands);
- }
- }
$selectedRoomServiceProduct = array();
if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
@@ -1270,8 +1238,8 @@ class AdminCartsControllerCore extends AdminController
'can_edit' => $this->tabAccess['edit'],
));
- $response['html_exta_demands'] = $this->context->smarty->fetch(
- _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/_cart_booking_demands.tpl'
+ $response['html_exta_services'] = $this->context->smarty->fetch(
+ _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/_cart_booking_services.tpl'
);
} else {
$response['hasError'] = true;
@@ -1281,26 +1249,6 @@ class AdminCartsControllerCore extends AdminController
$this->ajaxDie(json_encode($response));
}
- // Process when admin changes extra demands of any room while order creation process form.tpl
- public function ajaxProcessChangeRoomDemands()
- {
- if ($this->tabAccess['edit'] === 1) {
- $response = array('status' => false);
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- $response['status'] = true;
- }
- }
- }
- $this->ajaxDie(json_encode($response));
- }
- }
-
public static function getOrderTotalUsingTaxCalculationMethod($id_cart)
{
$context = Context::getContext();
diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php
index 7fd12828e..dc14150e6 100644
--- a/controllers/admin/AdminCustomerPreferencesController.php
+++ b/controllers/admin/AdminCustomerPreferencesController.php
@@ -107,6 +107,20 @@ class AdminCustomerPreferencesControllerCore extends AdminController
'cast' => 'intval',
'type' => 'bool'
),
+ 'PS_CUSTOMER_NATIONALITY' => array(
+ 'title' => $this->l('Enable nationality'),
+ 'hint' => $this->l('Display or not the nationality field.'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
+ 'PS_CUSTOMER_NATIONALITY_MANDATORY' => array(
+ 'title' => $this->l('Nationality is mandatory'),
+ 'hint' => $this->l('If you choose yes, your customer will have to select their nationality.'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
'PS_CUSTOMER_NWSL' => array(
'title' => $this->l('Enable newsletter registration'),
'hint' => $this->l('Display or not the newsletter registration tick box.'),
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index b013b3fe8..bb2fd3fc4 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -77,12 +77,39 @@ class AdminCustomersControllerCore extends AdminController
$groups_array[$group['id_group']] = $group['name'];
}
+ $selected_nationalities = array();
+ $nationalities_result = Db::getInstance()->executeS('
+ SELECT DISTINCT cl.id_country, cl.name
+ FROM '._DB_PREFIX_.'customer c
+ INNER JOIN '._DB_PREFIX_.'country_lang cl ON (cl.id_country = c.id_country AND cl.id_lang = '.(int)$this->context->language->id.')
+ WHERE c.id_country != 0 AND c.deleted = 0
+ ORDER BY cl.name ASC
+ ');
+ foreach ($nationalities_result as $row) {
+ $selected_nationalities[$row['id_country']] = $row['name'];
+ }
+ $selected_nationalities[-1] = $this->l('Other');
+ $selected_nationalities[0] = $this->l('None');
+
+ $selected_countries = array();
+ $countries_result = Db::getInstance()->executeS('
+ SELECT DISTINCT cl.id_country, cl.name
+ FROM '._DB_PREFIX_.'address ad
+ INNER JOIN '._DB_PREFIX_.'country_lang cl ON (cl.id_country = ad.id_country AND cl.id_lang = '.(int)$this->context->language->id.')
+ WHERE ad.deleted = 0
+ ORDER BY cl.name ASC
+ ');
+ foreach ($countries_result as $row) {
+ $selected_countries[$row['id_country']] = $row['name'];
+ }
+
$this->_join = 'LEFT JOIN '._DB_PREFIX_.'gender_lang gl ON (a.id_gender = gl.id_gender AND gl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'group_lang grl ON (a.id_default_group = grl.id_group AND grl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'orders o ON (a.id_customer = o.id_customer)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'address ad ON (ad.id_customer = a.id_customer AND ad.deleted = 0)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'state adstate ON (adstate.id_state = ad.id_state)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'country_lang adcountry ON (adcountry.id_country = ad.id_country AND adcountry.id_lang = '.(int)$this->context->language->id.')';
+ $this->_join .= ' LEFT JOIN '._DB_PREFIX_.'country_lang natcountry ON (natcountry.id_country = a.id_country AND natcountry.id_lang = '.(int)$this->context->language->id.')';
$this->_group = 'GROUP BY a.`id_customer`';
$this->fields_list = array(
@@ -134,6 +161,16 @@ class AdminCustomersControllerCore extends AdminController
'list' => $groups_array,
'filter_key' => 'a!id_default_group',
),
+ 'nationality' => array(
+ 'title' => $this->l('Nationality'),
+ 'optional' => true,
+ 'visible_default' => false,
+ 'type' => 'select',
+ 'list' => $selected_nationalities,
+ 'filter_key' => 'a!id_country',
+ 'filter_type' => 'int',
+ 'orderby' => false,
+ ),
'total_orders' => array(
'title' => $this->l('Number of orders'),
'type' => 'range',
@@ -205,7 +242,10 @@ class AdminCustomersControllerCore extends AdminController
'title' => $this->l('Country'),
'optional' => true,
'visible_default' => false,
- 'havingFilter' => true,
+ 'type' => 'select',
+ 'list' => $selected_countries,
+ 'filter_key' => 'ad!id_country',
+ 'filter_type' => 'int',
'orderby' => false,
),
'address_phone' => array(
@@ -299,7 +339,8 @@ class AdminCustomersControllerCore extends AdminController
ad.company as address_company, ad.vat_number,
ad.address1, ad.address2, ad.city, adstate.name as state,
ad.postcode, adcountry.name as country, ad.phone as address_phone,
- ad.phone_mobile, ad.dni';
+ ad.phone_mobile, ad.dni,
+ (CASE WHEN a.id_country = -1 THEN \''.pSQL($this->l('Other')).'\' ELSE natcountry.name END) as nationality';
// Check if we can add a customer
if (Shop::isFeatureActive() && (Shop::getContext() == Shop::CONTEXT_ALL || Shop::getContext() == Shop::CONTEXT_GROUP)) {
@@ -585,6 +626,22 @@ class AdminCustomersControllerCore extends AdminController
'years' => $years
)
),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Nationality'),
+ 'name' => 'id_country',
+ 'required' => (bool)(Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY')),
+ 'col' => '4',
+ 'options' => array(
+ 'query' => Customer::getNationalities($this->context->language->id),
+ 'id' => 'id_country',
+ 'name' => 'name',
+ 'default' => array(
+ 'value' => '',
+ 'label' => $this->l('-- Choose --')
+ )
+ ),
+ ),
array(
'type' => 'switch',
'label' => $this->l('Enabled'),
@@ -942,6 +999,16 @@ class AdminCustomersControllerCore extends AdminController
$gender = new Gender($customer->id_gender, $this->context->language->id);
$gender_image = $gender->getImage();
+ $nationality = '';
+ if ($customer->id_country == -1) {
+ $nationality = Translate::getAdminTranslation('Other', 'AdminCustomers');
+ } elseif ($customer->id_country) {
+ $nationalityCountry = new Country($customer->id_country, $this->context->language->id);
+ if (Validate::isLoadedObject($nationalityCountry)) {
+ $nationality = $nationalityCountry->name;
+ }
+ }
+
$customer_stats = $customer->getStats();
$sql = 'SELECT SUM(total_paid_real) FROM '._DB_PREFIX_.'orders WHERE id_customer = %d AND valid = 1';
if ($total_customer = Db::getInstance()->getValue(sprintf($sql, $customer->id))) {
@@ -1091,6 +1158,7 @@ class AdminCustomersControllerCore extends AdminController
'shop_is_feature_active' => Shop::isFeatureActive(),
'name_shop' => $shop->name,
'customer_birthday' => Tools::displayDate($customer->birthday),
+ 'nationality' => $nationality,
'last_update' => Tools::displayDate($customer->date_upd, null, true),
'customer_exists' => Customer::customerExists($customer->email),
'id_lang' => $customer->id_lang,
@@ -1326,6 +1394,10 @@ class AdminCustomersControllerCore extends AdminController
}
}
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY') && !Tools::getValue('id_country')) {
+ $this->errors[] = Tools::displayError('Nationality is required.');
+ }
+
$customer = new Customer();
$this->errors = array_merge($this->errors, $customer->validateFieldsRequiredDatabase());
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index a790be281..06a92e48b 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -161,7 +161,6 @@ class AdminImportControllerCore extends AdminController
$this->required_fields = array('id_hotel', 'name');
self::$validators['image'] = array('AdminImportController', 'split');
- self::$validators['id_additional_facilities'] = array('AdminImportController', 'split');
self::$validators['id_service_products'] = array('AdminImportController', 'split');
self::$validators['id_features'] = array('AdminImportController', 'split');
$this->available_fields = array(
@@ -194,7 +193,6 @@ class AdminImportControllerCore extends AdminController
'max_children' => array('label' => $this->l('Maximum children')),
'max_room_occupancy' => array('label' => $this->l('Maximum room occupancy')),
'show_at_front' => array('label' => $this->l('Show at front (0/1)')),
- 'id_additional_facilities' => array('label' => $this->l('Additional facilities IDs (x,y,z...)')),
'id_service_products' => array('label' => $this->l('Service products IDs (x, y, z...)')),
'id_features' => array('label' => $this->l('Feature IDs (x, y, z...)')),
'description_short' => array('label' => $this->l('Short description')),
@@ -285,7 +283,6 @@ class AdminImportControllerCore extends AdminController
case $this->entities[$this->l('Bookings')]:
$this->required_fields = array('id_customer', 'duration_dates', 'num_rooms', 'id_product');
self::$validators['duration_dates'] = array('AdminImportController', 'split');
- self::$validators['id_additional_facilities'] = array('AdminImportController', 'split');
self::$validators['id_service_products'] = array('AdminImportController', 'split');
$this->available_fields = array(
@@ -312,10 +309,6 @@ class AdminImportControllerCore extends AdminController
'label' => $this->l('Service Product IDs (x:n, y:n, z:n,..)'),
'help' => $this->l('id_service_product:quantity')
),
- 'id_additional_facilities' => array(
- 'label' => $this->l('Additional Facilities IDs (x:a, y:b, z:c,...)'),
- 'help' => $this->l('id_additional_facility:id_option')
- ),
);
break;
case $this->entities[$this->l('Customers')]:
@@ -1746,18 +1739,6 @@ class AdminImportControllerCore extends AdminController
}
$objHotelAdvancePayment->save();
- if (isset($product->id_additional_facilities) && $product->id_additional_facilities) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->deleteRoomTypeDemands($product->id);
- foreach ($product->id_additional_facilities as $idGlobalDemand) {
- if (Validate::isLoadedObject(new HotelRoomTypeGlobalDemand((int) $idGlobalDemand))) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $product->id;
- $objRoomTypeDemand->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemand->save();
- }
- }
- }
//delete existing images if "delete_existing_images" is set to 1
if (isset($product->delete_existing_images)) {
@@ -2558,7 +2539,6 @@ class AdminImportControllerCore extends AdminController
}
$serviceProducts = array();
- $globalDemands = array();
if (isset($orderProduct['id_service_products']) && count($orderProduct['id_service_products'])) {
foreach ($orderProduct['id_service_products'] as $serviceProdKey => $serviceProd) {
$serviceProd = explode(':', $serviceProd);
@@ -2579,28 +2559,6 @@ class AdminImportControllerCore extends AdminController
}
}
- if (isset($orderProduct['id_additional_facilities']) && count($orderProduct['id_additional_facilities'])) {
- foreach ($orderProduct['id_additional_facilities'] as $globalDemandKey => $globalDemand) {
- $globalDemand = explode(':', $globalDemand);
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($globalDemand[0], $this->context->language->id);
- if (Validate::isLoadedObject($objGlobalDemand)) {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- // incase no option is provided or if the provided id is not valid or the id is not connected to the diffrent option, we will set the first option as default.
- if ((!isset($globalDemand[1])
- || !Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($globalDemand[1])
- || $objAdvOption->id_global_demand != $globalDemand[0]))
- && ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($objGlobalDemand->id))
- ) {
- $globalDemand[1] = $advOptions[0]['id'];
- }
-
- $globalDemands[$globalDemandKey]['id_global_demand'] = $globalDemand[0];
- $globalDemands[$globalDemandKey]['id_option'] = isset($globalDemand[1]) ? $globalDemand[1] : 0;
- }
- }
- }
-
- $globalDemands = json_encode($globalDemands);
$objCartBooking->updateCartBooking(
$orderProduct['id_product'],
$occupancy,
@@ -2609,7 +2567,6 @@ class AdminImportControllerCore extends AdminController
0,
date('Y-m-d', strtotime($dateFrom)),
date('Y-m-d', strtotime($dateTo)),
- $globalDemands,
$serviceProducts,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -3364,12 +3321,6 @@ class AdminImportControllerCore extends AdminController
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing_lang`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing_group`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_lang`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option_lang`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_demand_price`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_demand`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_service_product_price`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'service_product_cart_detail`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_restriction_date_range`');
@@ -3472,8 +3423,6 @@ class AdminImportControllerCore extends AdminController
'referrer_cache',
'htl_cart_booking_data',
'htl_booking_detail',
- 'htl_booking_demands',
- 'htl_booking_demands_tax',
'service_product_order_detail',
'service_product_cart_detail',
);
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 43838ccc8..2681ad61f 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -587,6 +587,12 @@ class AdminNormalProductsControllerCore extends AdminController
if ($this->_list) {
$context = $this->context->cloneContext();
$context->shop = clone($context->shop);
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $tourismTaxContext = $useTourismTax ? TaxConfiguration::resolveServiceLineTaxContext(
+ (int) Configuration::get('WK_PRIMARY_HOTEL'),
+ 0,
+ new Address(0)
+ ) : null;
/* update product final price */
for ($i = 0; $i < $nb; $i++) {
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP) {
@@ -598,6 +604,31 @@ class AdminNormalProductsControllerCore extends AdminController
$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null,
(int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, $nothing, true, true,
$context);
+
+ if ($useTourismTax) {
+ $unitPriceTaxExcl = Product::getPriceStatic($this->_list[$i]['id_product'], false, null,
+ 6, null, false, true, 1, true, null, null, null, $nothing, true, true,
+ $context);
+ $serviceTourismTaxAmount = 0.0;
+ $idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $this->_list[$i]['id_product']);
+ if ($idTourismTaxRulesGroup) {
+ $taxCalculator = TaxManagerFactory::getManager(
+ $tourismTaxContext['address'],
+ $idTourismTaxRulesGroup
+ )->getTaxCalculator();
+ $serviceTourismTaxAmount = $taxCalculator->getTaxesTotalAmount(
+ (float) $unitPriceTaxExcl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ $tourismTaxContext['collectionType'],
+ 1,
+ $this->context->currency->id
+ );
+ }
+ $this->_list[$i]['price_tmp'] += $serviceTourismTaxAmount;
+ }
}
}
@@ -3373,6 +3404,26 @@ class AdminNormalProductsControllerCore extends AdminController
// $data->assign('productFeaturePrices', $productFeaturePrices);
// }
+ if (Configuration::get('QLO_USE_TOURISM_TAX') && !Tax::excludeTaxeOption()) {
+ $tourismTaxRulesGroups = TaxRulesGroup::getTaxRulesGroupsForOptions(true, true);
+ $data->assign('tourismTaxRulesGroups', $tourismTaxRulesGroups);
+ $data->assign('id_tourism_tax_rules_group', isset($product->id_tourism_tax_rules_group) ? (int) $product->id_tourism_tax_rules_group : 0);
+
+ $tourismTaxRates = array();
+ foreach ($tourismTaxRulesGroups as $tourismTaxRulesGroup) {
+ $idTourismTaxRulesGroup = (int) $tourismTaxRulesGroup['id_tax_rules_group'];
+ if (!$idTourismTaxRulesGroup) {
+ continue;
+ }
+ $tourismTaxRates[$idTourismTaxRulesGroup] = TaxConfiguration::getPreviewParams(
+ $idTourismTaxRulesGroup,
+ $address,
+ (int) $this->context->language->id
+ );
+ }
+ $data->assign('tourismTaxRatesByGroup', $tourismTaxRates);
+ }
+
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 547110394..e39c5d6dd 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -33,6 +33,7 @@ class AdminOrdersControllerCore extends AdminController
protected $statuses_array = array();
protected $all_order_sources = array();
+ protected $bookingSourcesArray = array();
protected $hotelsArray = array();
protected $roomTypesArray = array();
protected $roomsArray = array();
@@ -75,6 +76,10 @@ class AdminOrdersControllerCore extends AdminController
(SELECT GROUP_CONCAT(CONCAT(ps.period, \'~\', ps.cnt) ORDER BY ps.period SEPARATOR \'::\') FROM (SELECT CONCAT(hbd.`date_from`, \'|\', hbd.`date_to`) AS period, COUNT(*) AS cnt FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order` GROUP BY hbd.`date_from`, hbd.`date_to`) AS ps) AS stay_periods,
(SELECT COUNT(spod.`id_service_product_order_detail`) FROM `'._DB_PREFIX_.'service_product_order_detail` spod WHERE spod.`id_order` = a.`id_order` AND spod.`id_htl_booking_detail`=0) as num_products';
+ $this->_select .= ',
+ (SELECT sl.`name` FROM `'._DB_PREFIX_.'source` s LEFT JOIN `'._DB_PREFIX_.'source_lang` sl ON (sl.`id_source` = s.`id_source` AND sl.`id_lang` = '.(int)$this->context->language->id.') WHERE s.`id_source` = a.`id_source`) AS `booking_source_name`,
+ (SELECT s.`code` FROM `'._DB_PREFIX_.'source` s WHERE s.`id_source` = a.`id_source`) AS `booking_source_code`';
+
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = a.`id_customer`)
LEFT JOIN `'._DB_PREFIX_.'currency` cu ON (cu.`id_currency` = a.`id_currency`)
@@ -114,6 +119,9 @@ class AdminOrdersControllerCore extends AdminController
foreach ($all_order_sources as $source) {
$this->all_order_sources[$source['source']] = $source['source'];
}
+ foreach (Source::getSourcesUsedInOrders((int)$this->context->language->id) as $bookingSource) {
+ $this->bookingSourcesArray[$bookingSource['id_source']] = $bookingSource['name'];
+ }
$hotelsArray = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1);
foreach ($hotelsArray as $hotel) {
@@ -280,6 +288,15 @@ class AdminOrdersControllerCore extends AdminController
'filter_key' => 'a!source',
'list' => $this->all_order_sources,
'optional' => true,
+ ),
+ 'booking_source_name' => array(
+ 'title' => $this->l('Booking Source'),
+ 'type' => 'select',
+ 'filter_key' => 'a!id_source',
+ 'list' => $this->bookingSourcesArray,
+ 'orderby' => false,
+ 'callback' => 'formatBookingSource',
+ 'optional' => true,
'visible_default' => true
),
'osname' => array(
@@ -369,6 +386,15 @@ class AdminOrdersControllerCore extends AdminController
return Tools::displayPrice($echo, (int)$idCurrency);
}
+ public function formatBookingSource($echo, $row)
+ {
+ if (!$echo) {
+ return '--';
+ }
+
+ return Tools::safeOutput($echo);
+ }
+
public function formatStayPeriods($value, $row)
{
if (empty($value)) {
@@ -484,6 +510,7 @@ class AdminOrdersControllerCore extends AdminController
if (!$cart_order_exists) {
$this->context->cart = $cart;
$this->context->currency = new Currency((int)$cart->id_currency);
+ $this->context->smarty->assign('info_icon_path', $this->context->link->getMediaLink(_MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icon-info.svg'));
$this->context->customer = new Customer((int)$cart->id_customer);
// validate cart for removing invalid data from cart before new order creation
// remove not linked services with room types from cart if not allowed to book them
@@ -567,6 +594,7 @@ class AdminOrdersControllerCore extends AdminController
'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
'occupancy_required_for_booking' => $occupancyRequiredForBooking,
+ 'booking_sources' => Source::getAllSource(true, (int)$this->context->language->id),
));
} else {
@@ -754,6 +782,7 @@ class AdminOrdersControllerCore extends AdminController
'current_index' => self::$currentIndex,
'order' => $objOrder,
'currencies' => $currencies,
+ 'currency' => new Currency($objOrder->id_currency),
'payment_methods' => $payment_methods,
'payment_types' => $objOrder->getPaymentsTypes(),
'invoices_collection' => $objOrder->getInvoicesCollection(),
@@ -956,6 +985,7 @@ class AdminOrdersControllerCore extends AdminController
'invoices_collection' => $objOrder->getInvoicesCollection(),
'currency' => new Currency($objOrder->id_currency),
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
+ 'use_tourism_tax' => (bool) Configuration::get('QLO_USE_TOURISM_TAX'),
)
);
$modal = array(
@@ -1011,37 +1041,9 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['id_booking_detail'] = $productLineData['id'];
- $objBookingDemand = new HotelBookingDemands();
-
// set context currency So that we can get prices in the order currency
$this->context->currency = $objCurrency;
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1,
- $productLineData['id']
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- $smartyVars['roomTypeDemands'] = $roomTypeDemands;
- }
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -1061,7 +1063,7 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['additionalServices'] = $additionalServices[$productLineData['id']];
}
- // get room type additional demands
+ // get room type extra services
if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
// get all services
$objProduct = new Product();
@@ -1104,7 +1106,7 @@ class AdminOrdersControllerCore extends AdminController
}
}
-
+
$smartyVars['serviceProducts'] = $serviceProducts;
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1);
@@ -1157,33 +1159,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1, 0, 1);
if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) {
- $objBookingDemand = new HotelBookingDemands();
foreach($bookingOrderInfo as $key => $booking) {
if ((in_array($booking['id'], $refundReqBookings)) || $booking['is_refunded']) {
unset($bookingOrderInfo[$key]);
} else {
- $bookingOrderInfo[$key]['total_price_tax_incl'] += $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 1,
- 1,
- $booking['id']
- );
- $bookingOrderInfo[$key]['total_price_tax_excl'] += $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 1,
- 0,
- $booking['id']
- );
$bookingOrderInfo[$key]['total_price_tax_incl'] += $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -2245,6 +2224,14 @@ class AdminOrdersControllerCore extends AdminController
$advancePaymentAmount = $objCart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
}
+ $idBookingSource = (int)Tools::getValue('id_booking_source');
+ if ($idBookingSource) {
+ $objBookingSource = new Source($idBookingSource);
+ if (!Validate::isLoadedObject($objBookingSource) || !$objBookingSource->active) {
+ $this->errors[] = Tools::displayError('Please select a valid Booking Source.');
+ }
+ }
+
// Validate data if required
if ($orderTotal > 0) {
$moduleName = trim(Tools::getValue('payment_module_name'));
@@ -2265,15 +2252,13 @@ class AdminOrdersControllerCore extends AdminController
$paymentAmount = $orderTotal;
}
- if ($paymentAmount >= 0) {
+ if ($paymentAmount > 0) {
if (!$moduleName) {
$this->errors[] = Tools::displayError('Please enter Payment method.');
} elseif ($moduleName && !Validate::isGenericName($moduleName)) {
$this->errors[] = Tools::displayError('Payment method is invalid. Please enter a valid payment method.');
}
- }
- if ($paymentAmount > 0) {
if (!$paymentType) {
$this->errors[] = Tools::displayError('Please select a Payment source.');
} elseif ($paymentType && !Validate::isUnsignedInt($paymentType)) {
@@ -2290,10 +2275,14 @@ class AdminOrdersControllerCore extends AdminController
// Set payment module details
$objPaymentModule = new BoOrder();
- $objPaymentModule->displayName = $moduleName;
+ if ($moduleName) {
+ $objPaymentModule->displayName = $moduleName;
+ }
if ($orderTotal > 0) {
- $objPaymentModule->payment_type = $paymentType;
+ if ($paymentType) {
+ $objPaymentModule->payment_type = $paymentType;
+ }
// Set order state
if ($isFullPayment) {
@@ -2333,6 +2322,10 @@ class AdminOrdersControllerCore extends AdminController
$extraVars = null;
}
+ if ($idBookingSource) {
+ $objPaymentModule->idBookingSource = $idBookingSource;
+ }
+
$amountPaid = Tools::ps_round($amountPaid, 6);
$objEmployee = new Employee($this->context->cookie->id_employee);
$sendMails = Tools::getValue('send_mails', true);
@@ -2514,44 +2507,6 @@ class AdminOrdersControllerCore extends AdminController
}
}
- // update rooms bookings demands (htl_booking_demands)
- $objBookingDemand = new HotelBookingDemands();
- if ($orderBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands($order->id, 0, 0, 0, 0, 0)) {
- $fields = array(
- 'unit_price_tax_excl',
- 'unit_price_tax_incl',
- 'total_price_tax_excl',
- 'total_price_tax_incl',
- );
-
- $vatAddress = new Address((int)$order->id_address_tax);
- $idLang = (int) $order->id_lang;
- foreach ($orderBookingDemands as $bookingDemand) {
- $objBookingDemand = new HotelBookingDemands($bookingDemand['id_booking_demand']);
- foreach ($fields as $field) {
- $objBookingDemand->{$field} = Tools::convertPriceFull(
- $objBookingDemand->{$field},
- $old_currency,
- $currency
- );
- }
-
- // update Tax of bookings demands
- if ($objBookingDemand->save()) {
- $taxManager = TaxManagerFactory::getManager(
- $vatAddress,
- $objBookingDemand->id_tax_rules_group
- );
- $taxCalculator = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalculator->computation_method;
- $objBookingDemand->tax_calculator = $taxCalculator;
-
- // Now save tax details of the extra demand with replace = 1
- $objBookingDemand->setBookingDemandTaxDetails(1);
- }
- }
- }
-
$fields = array(
'unit_price_tax_excl',
'unit_price_tax_incl',
@@ -2713,6 +2668,10 @@ class AdminOrdersControllerCore extends AdminController
_PS_PRICE_COMPUTE_PRECISION_
);
$order->update();
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
}
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
@@ -2881,6 +2840,11 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
+
+ $loopOrderInvoice = new OrderInvoice((int) $id_order_invoice);
+ if (Validate::isLoadedObject($loopOrderInvoice)) {
+ $loopOrderInvoice->recomputeTotalsFromLines();
+ }
}
// Update Order
@@ -3067,12 +3031,25 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-order-source';
$helper->icon = 'icon-globe';
$helper->color = 'color1';
+ $helper->visible = false;
$helper->title = $this->l('Order Source');
$helper->tooltip = $this->l('Order source shows from which source the order was placed.');
$helper->subtitle = $orderHistory[0]['id_employee'] ? $this->l('Back office') : $this->l('Front office');
$helper->value = $objOrder->source;
$this->kpis[] = $helper;
+ $objBookingSource = new Source((int)$objOrder->id_source, $this->context->language->id);
+ if (Validate::isLoadedObject($objBookingSource)) {
+ $helper = new HelperKpi();
+ $helper->id = 'box-booking-source';
+ $helper->icon = 'icon-tag';
+ $helper->color = 'color2';
+ $helper->title = $this->l('Booking Source');
+ $helper->tooltip = $this->l('Booking source shows the source from which this booking originated, e.g. Walk-in, Website, OTA.');
+ $helper->value = $objBookingSource->name;
+ $this->kpis[] = $helper;
+ }
+
$objCustomerThread = new CustomerThread();
$idCustomerThread = $objCustomerThread->getIdCustomerThreadByIdOrder($objOrder->id);
$helper = new HelperKpi();
@@ -3404,6 +3381,9 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$orderHotelServiceProducts = array();
$orderStandaloneServiceProducts = array();
+ $standaloneServiceTourismTaxStatusMap = Configuration::get('QLO_USE_TOURISM_TAX')
+ ? OrderTaxDetail::getStandaloneServiceTourismTaxStatuses($order->id)
+ : array();
// products current stock (from stock_available)
foreach ($products as &$product) {
// Get total customized quantity for current product
@@ -3452,12 +3432,38 @@ class AdminOrdersControllerCore extends AdminController
if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
$hotelProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($order->id, $product['id_order_detail'], $product['product_id'], Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
foreach ($hotelProducts as $hotelProduct) {
+ $tourismTaxStatus = isset($standaloneServiceTourismTaxStatusMap[$hotelProduct['id_service_product_order_detail']])
+ ? $standaloneServiceTourismTaxStatusMap[$hotelProduct['id_service_product_order_detail']]
+ : null;
+ if ($tourismTaxStatus) {
+ $hotelProduct['tourism_tax_status'] = $tourismTaxStatus['status'];
+ } else {
+ $hotelProduct['tourism_tax_status'] = Product::getIdTourismTaxRulesGroupByIdProduct((int) $hotelProduct['id_product'])
+ ? OrderTaxDetail::STATUS_NONE
+ : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+ $hotelProduct['tourism_tax_total'] = $tourismTaxStatus ? $tourismTaxStatus['total'] : 0.0;
+ $hotelProduct['total_service_tax'] = $hotelProduct['total_price_tax_incl'] - $hotelProduct['total_price_tax_excl'];
+ $hotelProduct['total_service_tax_only'] = $hotelProduct['total_service_tax'] - $hotelProduct['tourism_tax_total'];
$orderHotelServiceProducts[] = array_merge($product, $hotelProduct);
}
}
if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
$standaloneProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($order->id, $product['id_order_detail'], $product['product_id'], Product::SELLING_PREFERENCE_STANDALONE);
foreach ($standaloneProducts as $standaloneProduct) {
+ $tourismTaxStatus = isset($standaloneServiceTourismTaxStatusMap[$standaloneProduct['id_service_product_order_detail']])
+ ? $standaloneServiceTourismTaxStatusMap[$standaloneProduct['id_service_product_order_detail']]
+ : null;
+ if ($tourismTaxStatus) {
+ $standaloneProduct['tourism_tax_status'] = $tourismTaxStatus['status'];
+ } else {
+ $standaloneProduct['tourism_tax_status'] = Product::getIdTourismTaxRulesGroupByIdProduct((int) $standaloneProduct['id_product'])
+ ? OrderTaxDetail::STATUS_NONE
+ : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+ $standaloneProduct['tourism_tax_total'] = $tourismTaxStatus ? $tourismTaxStatus['total'] : 0.0;
+ $standaloneProduct['total_service_tax'] = $standaloneProduct['total_price_tax_incl'] - $standaloneProduct['total_price_tax_excl'];
+ $standaloneProduct['total_service_tax_only'] = $standaloneProduct['total_service_tax'] - $standaloneProduct['tourism_tax_total'];
$orderStandaloneServiceProducts[] = array_merge($product, $standaloneProduct);
}
}
@@ -3487,52 +3493,18 @@ class AdminOrdersControllerCore extends AdminController
$total_room_tax = 0;
$totalRoomsCostTE = 0;
- $totalDemandsPriceTE = 0;
- $totalDemandsPriceTI = 0;
$totalRefundedRooms = 0;
$orderConvenienceFeeServices = array();
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $bookingTourismTaxStatusMap = OrderTaxDetail::getAppliedTourismTaxTotals($order->id, OrderTaxDetail::SCOPE_ROOM_STATUS);
+ $serviceTourismTaxMap = OrderTaxDetail::getAppliedTourismTaxTotals($order->id, OrderTaxDetail::SCOPE_SERVICE);
if ($order_detail_data = $objBookingDetail->getOrderFormatedBookinInfoByIdOrder($order->id)) {
- $objBookingDemand = new HotelBookingDemands();
$objHotelRoomType = new HotelRoomType();
foreach ($order_detail_data as $key => $value) {
$order_detail_data[$key]['total_room_price_te'] = $value['total_price_tax_excl'];
$order_detail_data[$key]['total_room_price_ti'] = $value['total_price_tax_incl'];
-
- $order_detail_data[$key]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 1,
- 0,
- 1,
- $value['id']
- );
- $order_detail_data[$key]['total_room_price_ti'] += $order_detail_data[$key]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 0,
- 1,
- 1,
- $value['id']
- );
- $totalDemandsPriceTI += $order_detail_data[$key]['extra_demands_price_ti'];
- $order_detail_data[$key]['total_room_price_te'] += $order_detail_data[$key]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 0,
- 1,
- 0,
- $value['id']
- );
- $totalDemandsPriceTE += $order_detail_data[$key]['extra_demands_price_te'];
+ $bookingTourismTaxAmount = isset($bookingTourismTaxStatusMap[$value['id']]) ? (float) $bookingTourismTaxStatusMap[$value['id']]['total'] : 0.0;
+ $order_detail_data[$key]['tourism_tax_amount'] = $bookingTourismTaxAmount;
$order_detail_data[$key]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -3666,7 +3638,7 @@ class AdminOrdersControllerCore extends AdminController
/*Product price when order was created*/
$totalRoomsCostTE += $value['total_price_tax_excl'];
- $total_room_tax += $value['total_price_tax_incl']-$value['total_price_tax_excl'];
+ $total_room_tax += ($value['total_price_tax_incl'] - $value['total_price_tax_excl']);
$num_days = HotelHelper::getNumberOfDays($value['date_from'], $value['date_to']);
$order_detail_data[$key]['unit_amt_tax_excl'] = $value['total_price_tax_excl']/$num_days;
$order_detail_data[$key]['unit_amt_tax_incl'] = $value['total_price_tax_incl']/$num_days;
@@ -3674,6 +3646,12 @@ class AdminOrdersControllerCore extends AdminController
$order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl'];
$order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']);
$order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te'];
+ $bookingTourismTaxStatus = isset($bookingTourismTaxStatusMap[$value['id']]) ? $bookingTourismTaxStatusMap[$value['id']] : null;
+ $roomTourismTaxTotal = $bookingTourismTaxStatus ? $bookingTourismTaxStatus['total'] : 0.0;
+ $serviceTourismTaxTotal = isset($serviceTourismTaxMap[$value['id']]) ? $serviceTourismTaxMap[$value['id']] : 0.0;
+ $order_detail_data[$key]['tourism_tax_status'] = self::combinedRoomTourismTaxStatus($value['id'], $value['id_product'], $bookingTourismTaxStatus, $serviceTourismTaxTotal);
+ $order_detail_data[$key]['tourism_tax_total'] = $roomTourismTaxTotal + $serviceTourismTaxTotal;
+ $order_detail_data[$key]['total_room_service_tax_only'] = $order_detail_data[$key]['total_room_tax'] - $roomTourismTaxTotal - $serviceTourismTaxTotal;
$order_detail_data[$key]['num_checkin_documents'] = HotelBookingDocument::getCountByIdHtlBooking($value['id']);
$order_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms($value['id_room'], null, null, (int) Context::getContext()->language->id);
@@ -3690,6 +3668,40 @@ class AdminOrdersControllerCore extends AdminController
$order_detail_data = array();
}
+ $orderTourismTaxHasApplied = false;
+ $orderTourismTaxHasUnapplied = false;
+ if ($useTourismTax && $order_detail_data) {
+ foreach ($order_detail_data as $bookingRow) {
+ if (!empty($bookingRow['is_cancelled']) || !empty($bookingRow['is_refunded'])) {
+ continue;
+ }
+ if (isset($bookingRow['tourism_tax_status'])) {
+ if ($bookingRow['tourism_tax_status'] === OrderTaxDetail::STATUS_APPLIED) {
+ $orderTourismTaxHasApplied = true;
+ } elseif ($bookingRow['tourism_tax_status'] !== OrderTaxDetail::STATUS_NOT_APPLICABLE) {
+ $orderTourismTaxHasUnapplied = true;
+ }
+ }
+ }
+ }
+
+ $productsTourismTaxHasApplied = false;
+ $productsTourismTaxHasUnapplied = false;
+ if ($useTourismTax) {
+ foreach (array_merge($orderHotelServiceProducts, $orderStandaloneServiceProducts) as $productRow) {
+ if (!empty($productRow['is_cancelled']) || !empty($productRow['is_refunded'])) {
+ continue;
+ }
+ if (isset($productRow['tourism_tax_status'])) {
+ if ($productRow['tourism_tax_status'] === OrderTaxDetail::STATUS_APPLIED) {
+ $productsTourismTaxHasApplied = true;
+ } elseif ($productRow['tourism_tax_status'] !== OrderTaxDetail::STATUS_NOT_APPLICABLE) {
+ $productsTourismTaxHasUnapplied = true;
+ }
+ }
+ }
+ }
+
if ($orderedRooms = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order->id,
0,
@@ -3813,13 +3825,22 @@ class AdminOrdersControllerCore extends AdminController
'refundReqBookings' => $refundReqBookings,
'refundReqProducts' => $refundReqProducts,
'refundedAmount' => $refundedAmount,
- 'totalDemandsPriceTI' => $totalDemandsPriceTI,
- 'totalDemandsPriceTE' => $totalDemandsPriceTE,
'totalRoomsCostTE' => $totalRoomsCostTE,
'total_room_tax' => $total_room_tax,
'htl_booking_order_data' => $bookingOrderInfo,
'hotel_order_status' => $htlOrderStatus,
'order_detail_data' => $order_detail_data,
+ 'use_tourism_tax' => $useTourismTax,
+ 'tourism_tax_room' => array_sum(array_column($bookingTourismTaxStatusMap, 'total')),
+ 'tourism_tax_service' => array_sum($serviceTourismTaxMap),
+ 'tourism_tax_products' => array_sum(array_column($standaloneServiceTourismTaxStatusMap, 'total')),
+ 'info_icon_path' => $this->context->link->getMediaLink(_MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icon-info.svg'),
+ 'tourism_tax_status_applied' => OrderTaxDetail::STATUS_APPLIED,
+ 'tourism_tax_status_not_applicable' => OrderTaxDetail::STATUS_NOT_APPLICABLE,
+ 'order_tourism_tax_has_applied' => $orderTourismTaxHasApplied,
+ 'order_tourism_tax_has_unapplied' => $orderTourismTaxHasUnapplied,
+ 'products_tourism_tax_has_applied' => $productsTourismTaxHasApplied,
+ 'products_tourism_tax_has_unapplied' => $productsTourismTaxHasUnapplied,
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
'hotel_service_products' => $orderHotelServiceProducts,
'standalone_service_products' => $orderStandaloneServiceProducts,
@@ -4306,21 +4327,23 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOption = new ServiceProductOption();
foreach ($products as $key => &$product) {
$idHotelAddress = Cart::getIdAddressForTaxCalculation($product['id_product'], $idHotel);
- $product['price_tax_incl'] = RoomTypeServiceProductPrice::getPrice($product['id_product'], $idHotel, null, true);
- $product['price_tax_excl'] = RoomTypeServiceProductPrice::getPrice($product['id_product'], $idHotel, null, false);
+ $product['price_tax_incl'] = Product::getServiceProductPrice($product['id_product'], null, $idHotel, false, true);
+ $product['price_tax_excl'] = Product::getServiceProductPrice($product['id_product'], null, $idHotel, false, false);
// if product has options then set the price of the first selected option of the product
if ($product['options'] = $objServiceProductOption->getProductOptions($product['id_product'])) {
- $product['price_tax_incl'] = RoomTypeServiceProductPrice::getPrice(
+ $product['price_tax_incl'] = Product::getServiceProductPrice(
$product['id_product'],
- $idHotel,
$product['options'][0]['id_product_option'],
+ $idHotel,
+ false,
true
);
- $product['price_tax_excl'] = RoomTypeServiceProductPrice::getPrice(
+ $product['price_tax_excl'] = Product::getServiceProductPrice(
$product['id_product'],
- $idHotel,
$product['options'][0]['id_product_option'],
+ $idHotel,
+ false,
false
);
}
@@ -4442,8 +4465,8 @@ class AdminOrdersControllerCore extends AdminController
$currency = new Currency((int)$order->id_currency);
if ($idHotel = $addressTax->id_hotel) {
if ($id_product_option = $addProduct['product_option']) {
- $price_tax_incl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], $idHotel, $id_product_option, true);
- $price_tax_excl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], $idHotel, $id_product_option, false);
+ $price_tax_incl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, $idHotel, false, true);
+ $price_tax_excl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, $idHotel, false, false);
// convert price to order currency
$price_tax_excl = Tools::ps_round(Tools::convertPrice($price_tax_excl, $currency), _PS_PRICE_COMPUTE_PRECISION_);
@@ -4457,8 +4480,8 @@ class AdminOrdersControllerCore extends AdminController
}
} else {
if ($id_product_option = $addProduct['product_option']) {
- $price_tax_incl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], false, $id_product_option, true);
- $price_tax_excl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], false, $id_product_option, false);
+ $price_tax_incl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, false, false, true);
+ $price_tax_excl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, false, false, false);
// convert price to order currency
$price_tax_excl = Tools::ps_round(Tools::convertPrice($price_tax_excl, $currency), _PS_PRICE_COMPUTE_PRECISION_);
@@ -4744,6 +4767,7 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
+ $order_invoice->recomputeTotalsFromLines();
$order->total_shipping = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_incl = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_excl = $order_invoice->total_shipping_tax_excl;
@@ -5324,6 +5348,7 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
+ $order_invoice->recomputeTotalsFromLines();
$order->total_shipping = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_incl = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_excl = $order_invoice->total_shipping_tax_excl;
@@ -5465,6 +5490,7 @@ class AdminOrdersControllerCore extends AdminController
$this->context->cart->id_guest,
$idProduct
)) {
+ $useTourismTaxForNewBooking = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
foreach ($cartBookingData as $cb_k => $cb_v) {
$objCartBookingData = new HotelCartBookingData($cb_v['id']);
$objCartBookingData->id_order = $order->id;
@@ -5539,6 +5565,56 @@ class AdminOrdersControllerCore extends AdminController
}
if ($objBookingDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objBookingDetail->id_order_detail, (int) $objBookingDetail->id, 0);
+
+ if ($useTourismTaxForNewBooking) {
+ $idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct);
+ if ($idTourismTaxRulesGroup) {
+ $tourismTaxAddress = null;
+ if ($objCartBookingData->id_hotel) {
+ $hotelAddress = HotelBranchInformation::getAddress($objCartBookingData->id_hotel);
+ if ($hotelAddress && !empty($hotelAddress['id_address'])) {
+ $tourismTaxAddress = new Address((int) $hotelAddress['id_address']);
+ }
+ }
+ if (!$tourismTaxAddress || !Validate::isLoadedObject($tourismTaxAddress)) {
+ $tourismTaxAddress = new Address((int) Cart::getIdAddressForTaxCalculation($idProduct));
+ }
+
+ $tourismTaxNumNights = max(1, (int) HotelHelper::getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to));
+ $tourismTaxChildAges = array();
+ if ($objBookingDetail->child_ages) {
+ $decodedChildAges = json_decode($objBookingDetail->child_ages, true);
+ if (is_array($decodedChildAges)) {
+ $tourismTaxChildAges = array_map('intval', $decodedChildAges);
+ }
+ }
+ $tourismTaxCollectionType = Validate::isLoadedObject($objHotelBranch)
+ ? (int) $objHotelBranch->tourism_tax_collection_type
+ : HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxAddress,
+ (float) $objBookingDetail->total_price_tax_excl / $tourismTaxNumNights,
+ $objBookingDetail->date_from,
+ $tourismTaxNumNights,
+ (int) $objBookingDetail->adults,
+ $tourismTaxChildAges,
+ (int) $this->context->cart->id_currency,
+ $tourismTaxCollectionType,
+ $idLang,
+ 1,
+ $order->id,
+ (int) $objBookingDetail->id_order_detail,
+ $objBookingDetail->id,
+ 0
+ );
+ // Whether the checkbox exempts this room+its services is decided once,
+ // after the auto-attached service loop below runs — see there for why.
+ }
+ }
+
$objRoomTypeServiceProduct = new RoomTypeServiceProduct();
$objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
$objServiceProductCartDetail = new ServiceProductCartDetail();
@@ -5614,13 +5690,52 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->total_price_tax_incl = $totalPriceTaxIncl;
$objServiceProductOrderDetail->name = $service['name'];
$objServiceProductOrderDetail->quantity = 1;
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTaxForNewBooking) {
+ $idServiceTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $service['id_product']);
+ if ($idServiceTourismTaxRulesGroup) {
+ $serviceTourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(
+ (int) $objCartBookingData->id_hotel,
+ $objBookingDetail->id,
+ new Address((int) Cart::getIdAddressForTaxCalculation((int) $service['id_product']))
+ );
+ OrderTaxDetail::saveTourismTax(
+ $idServiceTourismTaxRulesGroup,
+ $serviceTourismTaxContext['address'],
+ $unitPriceTaxExcl,
+ $serviceTourismTaxContext['checkInDate'],
+ $serviceTourismTaxContext['numNights'],
+ $serviceTourismTaxContext['numAdults'],
+ $serviceTourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $serviceTourismTaxContext['collectionType'],
+ $idLang,
+ 1,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
+ }
}
}
+
+ if ($useTourismTaxForNewBooking && empty($product_informations['apply_tourism_tax'])) {
+ OrderTaxDetail::exemptBooking($objBookingDetail->id);
+ }
}
}
}
+ $order->total_paid = $order->getOrderTotal();
+ $order->total_paid_tax_incl = $order->total_paid;
+ $order->total_paid_tax_excl = $order->getOrderTotal(false);
+ $order->update();
+
// delete cart feature prices after room addition success
HotelRoomTypeFeaturePricing::deleteFeaturePrices($this->context->cart->id);
@@ -5873,6 +5988,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($objOrderInvoice) && Validate::isLoadedObject($objOrderInvoice)) {
+ $objOrderInvoice->recomputeTotalsFromLines();
$objOrder->total_shipping = $objOrderInvoice->total_shipping_tax_incl;
$objOrder->total_shipping_tax_incl = $objOrderInvoice->total_shipping_tax_incl;
$objOrder->total_shipping_tax_excl = $objOrderInvoice->total_shipping_tax_excl;
@@ -5921,9 +6037,43 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->hotel_name = $objHotelBranch->hotel_name;
}
}
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))
+ ) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(
+ $objServiceProductOrderDetail->id_hotel,
+ 0,
+ new Address((int) Cart::getIdAddressForTaxCalculation($idProduct))
+ );
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $objOrder->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $objOrder->id_lang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $objOrder->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
+ $objOrder->total_paid = $objOrder->getOrderTotal();
+ $objOrder->total_paid_tax_incl = $objOrder->total_paid;
+ $objOrder->total_paid_tax_excl = $objOrder->getOrderTotal(false);
+ $objOrder->update();
+
$response['status'] = true;
} else {
$response['status'] = false;
@@ -6162,9 +6312,6 @@ class AdminOrdersControllerCore extends AdminController
$order_detail->product_quantity = $old_quantity + $qty_diff;
$order_detail->reduction_percent = 0;
- // update taxes
- $res &= $order_detail->updateTaxAmount($order);
-
// Save order detail
$res &= $order_detail->update();
@@ -6245,8 +6392,6 @@ class AdminOrdersControllerCore extends AdminController
)));
}
- // get extra demands of the room before changing in the booking table
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$orderServiceProducts = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$id_order,
@@ -6264,18 +6409,6 @@ class AdminOrdersControllerCore extends AdminController
$obj_booking_detail->id
);
- $extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- 0,
- $id_room,
- $old_date_from,
- $old_date_to,
- 1,
- 0,
- 1,
- $obj_booking_detail->id
- );
-
// set occupancy details
$occupancy = array(
'adults' => $adults,
@@ -6300,46 +6433,7 @@ class AdminOrdersControllerCore extends AdminController
$new_total_price,
$obj_booking_detail->id
)) {
- // update extra demands total prices if dates are changes (price calc method for each day)
- if ($extraDemands) {
- foreach ($extraDemands as $demand) {
- if (isset($demand['extra_demands']) && $demand['extra_demands']) {
- foreach ($demand['extra_demands'] as $rDemand) {
- if ($rDemand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $objBookingDemand = new HotelBookingDemands($rDemand['id_booking_demand']);
-
- $numDays = HotelHelper::getNumberOfDays($new_date_from, $new_date_to);
- $demandPriceTE = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $demandPriceTI = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
-
- $objBookingDemand->total_price_tax_excl = $demandPriceTE;
- $objBookingDemand->total_price_tax_incl = $demandPriceTI;
-
- $objBookingDemand->save();
-
- if (isset($order_invoice)) {
- $order_invoice->total_paid_tax_excl -= $rDemand['total_price_tax_excl'];
- $order_invoice->total_paid_tax_incl -= $rDemand['total_price_tax_incl'];
-
- $order_invoice->total_paid_tax_excl += (float)$objBookingDemand->total_price_tax_excl;
- $order_invoice->total_paid_tax_incl += (float)$objBookingDemand->total_price_tax_incl;
- }
- }
- }
- }
- }
-
- }
+ $res &= $order_detail->updateTaxAmount($order);
if (isset($orderServiceProducts)
&& is_array($orderServiceProducts)
@@ -6391,7 +6485,6 @@ class AdminOrdersControllerCore extends AdminController
$objOrderDetail->save();
$this->context->cart = new Cart($objServiceProductOrderDetail->id_cart);
- $objOrderDetail->updateTaxAmount($order);
if (isset($order_invoice)) {
$order_invoice->total_paid_tax_excl -= $objServiceProductOrderDetail->total_price_tax_excl;
@@ -6405,16 +6498,68 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->total_price_tax_excl = $newTotalPriceTaxExcl;
$objServiceProductOrderDetail->total_price_tax_incl = $newTotalPriceTaxIncl;
$objServiceProductOrderDetail->save();
+
+ $objOrderDetail->updateTaxAmount($order);
}
}
}
}
}
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $roomTourismTaxParams = OrderTaxDetail::buildRoomTaxParams((int) $obj_booking_detail->id);
+ if ($roomTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $roomTourismTaxParams['idTaxRulesGroup'],
+ $roomTourismTaxParams['address'],
+ $roomTourismTaxParams['unitPriceTaxExcl'],
+ $roomTourismTaxParams['checkInDate'],
+ $roomTourismTaxParams['numNights'],
+ $roomTourismTaxParams['numAdults'],
+ $roomTourismTaxParams['childrenAges'],
+ $roomTourismTaxParams['idCurrency'],
+ $roomTourismTaxParams['collectionType'],
+ $roomTourismTaxParams['idLang'],
+ $roomTourismTaxParams['quantity'],
+ $roomTourismTaxParams['idOrder'],
+ $roomTourismTaxParams['idOrderDetail'],
+ $roomTourismTaxParams['idHtlBooking'],
+ $roomTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail((int) $obj_booking_detail->id) as $idActiveServiceLine) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams($idActiveServiceLine);
+ if (!$serviceTourismTaxParams) {
+ continue;
+ }
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
}
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
if($order->save()){
$roomType = Product::getProductName($id_product, null, $this->context->language->id);
$oldDateFromFormatted = date('d/m/Y', strtotime($old_date_from));
@@ -6536,15 +6681,11 @@ class AdminOrdersControllerCore extends AdminController
}
$objOrderDetail->total_price_tax_incl += $diffPriceTaxIncl;
$objOrderDetail->total_price_tax_excl += $diffPriceTaxExcl;
+ $objOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl;
+ $objOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl;
$objOrderDetail->product_quantity += $updateQty;
$objOrderDetail->reduction_percent = 0;
- // update taxes
- $result &= $objOrderDetail->updateTaxAmount($objOrder);
-
- // Save order detail
- $result &= $objOrderDetail->update();
-
$objServiceProductOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl;
$objServiceProductOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl;
$objServiceProductOrderDetail->total_price_tax_excl = $totalProductsTaxExcl;
@@ -6552,6 +6693,35 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->quantity += $updateQty;
$result &= $objServiceProductOrderDetail->update();
+ // update taxes
+ $result &= $objOrderDetail->updateTaxAmount($objOrder);
+
+ // Save order detail
+ $result &= $objOrderDetail->update();
+
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id);
+ if ($serviceTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
+
// Apply changes on Order
$objOrder = new Order($objOrderDetail->id_order);
$objOrder->total_products += $diffPriceTaxExcl;
@@ -6571,6 +6741,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += $diffPriceTaxExcl;
$objOrderInvoice->total_paid_tax_incl += $diffPriceTaxIncl;
$result &= $objOrderInvoice->update();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// Update product available quantity
@@ -6631,30 +6802,6 @@ class AdminOrdersControllerCore extends AdminController
$bookingPriceTaxIncl = Tools::processPriceRounding($objBookingDetail->total_price_tax_incl, 1, $order->round_type, $order->round_mode);
$bookingPriceTaxExcl = Tools::processPriceRounding($objBookingDetail->total_price_tax_excl, 1, $order->round_type, $order->round_mode);
- $objBookingDemand = new HotelBookingDemands();
- $roomExtraDemandTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $objBookingDetail->id_product,
- $objBookingDetail->id_room,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- 0,
- 1,
- 1,
- $objBookingDetail->id
- );
- $roomExtraDemandTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $objBookingDetail->id_product,
- $objBookingDetail->id_room,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- 0,
- 1,
- 0,
- $objBookingDetail->id
- );
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$additionlServicesTI = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -6795,10 +6942,8 @@ class AdminOrdersControllerCore extends AdminController
if ($order_detail->id_order_invoice != 0) {
// values changes as values are calculated accoding to the quantity of the product by webkul
$order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE);
$order_invoice->total_paid_tax_excl = $order_invoice->total_paid_tax_excl > 0 ? $order_invoice->total_paid_tax_excl : 0;
-
- $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI);
+ $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $additionlServicesTI);
$order_invoice->total_paid_tax_incl = $order_invoice->total_paid_tax_incl > 0 ? $order_invoice->total_paid_tax_incl : 0;
$order_invoice->total_products -= $diff_products_tax_excl;
@@ -6816,8 +6961,8 @@ class AdminOrdersControllerCore extends AdminController
// Update Order
// values changes as values are calculated accoding to the quantity of the product by webkul
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal() - $roomExtraDemandTI, _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false) - $roomExtraDemandTE, _PS_PRICE_COMPUTE_PRECISION_);
+ $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
+ $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_products -= ($diff_products_tax_excl + $additionlServicesTE);
$order->total_products = $order->total_products > 0 ? $order->total_products : 0;
@@ -6854,8 +6999,10 @@ class AdminOrdersControllerCore extends AdminController
$invoice_array[] = $invoice;
}
- // delete the demands od this booking
- $objBookingDemand->deleteBookingDemands($idHotelBooking);
+ OrderTaxDetail::hardDeleteForBooking(
+ $idHotelBooking,
+ ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHotelBooking)
+ );
$objServiceProductOrderDetail->deleteSeviceProducts(0, $idHotelBooking);
@@ -6922,6 +7069,10 @@ class AdminOrdersControllerCore extends AdminController
$order->update();
}
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
+
// Assign to smarty informations in order to show the new product line
$this->context->smarty->assign(array(
'order' => $order,
@@ -7014,6 +7165,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0;
$result &= $objOrder->update();
+
+ if (isset($objOrderInvoice) && $objOrderInvoice->id) {
+ $objOrderInvoice->recomputeTotalsFromLines();
+ }
}
if (!$result) {
@@ -7480,8 +7635,8 @@ class AdminOrdersControllerCore extends AdminController
}
}
- // To show rooms extra demands in the modal box in order details view page
- public function ajaxProcessGetRoomTypeBookingDemands()
+ // To show rooms extra services in the modal box in order details view page
+ public function ajaxProcessgetRoomTypeBookingServices()
{
$orderEdit = Tools::getValue('orderEdit');
if (($idProduct = Tools::getValue('id_product'))
@@ -7500,25 +7655,9 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['id_booking_detail'] = $idHtlBooking;
- $objBookingDemand = new HotelBookingDemands();
-
// set context currency So that we can get prices in the order currency
$this->context->currency = $objCurrency;
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- 1,
- $idHtlBooking
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -7539,11 +7678,11 @@ class AdminOrdersControllerCore extends AdminController
}
$smartyVars['orderEdit'] = $orderEdit;
-
+ $smartyVars['show_active'] = true;
$this->context->smarty->assign($smartyVars);
$modal = array(
- 'modal_id' => 'room-extra-demands',
+ 'modal_id' => 'room-extra-services',
'modal_class' => 'modal-lg order_detail_modal',
'modal_title' => ' '.$this->l('Extra Services'),
'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_extra_services.tpl'),
@@ -7643,61 +7782,6 @@ class AdminOrdersControllerCore extends AdminController
return $servicesTpl;
}
- public function processRenderFacilitiesBlock($idOrder, $idProduct, $dateFrom, $dateTo, $idRoom, $idHtlBookingDetail, $orderEdit)
- {
- $smartyVars = array();
- $objOrder = new Order($idOrder);
- $objCurrency = new Currency($objOrder->id_currency);
- $smartyVars['orderCurrency'] = $objOrder->id_currency;
- $smartyVars['currencySign'] = $objCurrency->sign;
- $smartyVars['link'] = $this->context->link;
- $smartyVars['id_booking_detail'] = $idHtlBookingDetail;
-
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($objOrder->id_currency);
-
- $objBookingDemand = new HotelBookingDemands();
-
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- 1,
- $idHtlBookingDetail
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
- // if admin is editing order
- if ($orderEdit) {
- $smartyVars['orderEdit'] = $orderEdit;
-
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- $smartyVars['roomTypeDemands'] = $roomTypeDemands;
- }
- }
-
- $smartyVars['show_active'] = true;
- $this->context->smarty->assign($smartyVars);
-
- $servicesTpl = $this->context->smarty->fetch(
- _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl'
- );
- return $servicesTpl;
- }
-
public function ajaxProcessUpdateSelectedRoomServices()
{
$response = array('hasError' => false);
@@ -7814,6 +7898,29 @@ class AdminOrdersControllerCore extends AdminController
$result &= $objOrderDetail->update();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id);
+ if ($serviceTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
+
if ($objOrderDetail->id_order_invoice != 0) {
// values changes as values are calculated accoding to the quantity of the product by webkul
$order_invoice = new OrderInvoice($objOrderDetail->id_order_invoice);
@@ -7833,6 +7940,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$result &= $objOrder->update();
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
}
}
@@ -8069,6 +8180,28 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->quantity = $objServiceProductCartDetail->quantity;
$objServiceProductOrderDetail->save();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id))
+ ) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
// update totals amount of order
$order->total_products = Tools::ps_round((float)($order->total_products + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_products_wt = Tools::ps_round((float)($order->total_products_wt + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
@@ -8082,6 +8215,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)$totalPriceChangeTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)$totalPriceChangeTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->save();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// discount
@@ -8359,6 +8493,28 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->auto_added = $autoAdded;
$objServiceProductOrderDetail->save();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id))
+ ) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
// update totals amount of order
$objOrder->total_products = Tools::ps_round((float)($objOrder->total_products + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products_wt = Tools::ps_round((float)($objOrder->total_products_wt + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
@@ -8372,6 +8528,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)$totalPriceChangeTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)$totalPriceChangeTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->save();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// discounts calculation for order
@@ -8485,6 +8642,8 @@ class AdminOrdersControllerCore extends AdminController
}
if ($res &= $objServiceProductOrderDetail->delete()) {
+ OrderTaxDetail::hardDeleteForBooking(0, array((int) $objServiceProductOrderDetail->id));
+
$order = new Order($objServiceProductOrderDetail->id_order);
if ($objOrderDetail->product_price_calculation_method == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
$numDays = HotelHelper::getNumberOfDays(
@@ -8535,6 +8694,10 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$res &= $order->update();
+
+ if (isset($objOrderInvoice) && $objOrderInvoice->id) {
+ $objOrderInvoice->recomputeTotalsFromLines();
+ }
}
if ($res) {
$response['service_panel']= $servicesBlock = $this->processRenderServicesPanel(
@@ -8549,7 +8712,7 @@ class AdminOrdersControllerCore extends AdminController
}
} else {
$response['hasError'] = true;
- $response['errors'] = $this->l('Additional service not found');
+ $response['errors'] = $this->l('Extra service not found');
}
} else {
$response['hasError'] = true;
@@ -8559,295 +8722,6 @@ class AdminOrdersControllerCore extends AdminController
$this->ajaxDie(json_encode($response));
}
- // Process when admin changes extra demands of any room while order creation process form.tpl
- public function ajaxProcessChangeRoomDemands()
- {
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- die('1');
- }
- }
- }
- die('0');
- }
-
- // Process when admin edit rooms and edit rooms additional facilities
- public function ajaxProcessAddRoomExtraDemands()
- {
- $response = array('success' => false, 'hasError' => false);
- if ($this->tabAccess['edit'] === 1) {
- if ($idHtlBooking = Tools::getValue('id_htl_booking')) {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail($idHtlBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- if ($roomDemands = json_decode($roomDemands, true)) {
- $order = new Order($objBookingDetail->id_order);
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($order->id_currency);
-
- $vatAddress = new Address((int)$order->id_address_tax);
- $idLang = (int)$order->id_lang;
- $idProduct = $objBookingDetail->id_product;
- $objHtlBkDtl = new HotelBookingDetail();
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($roomDemands as $demand) {
- if (!ValidateCore::isPrice($demand['unit_price'])) {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($demand['id_global_demand'], $idLang);
- $response['hasError'] = true;
- $response['errors'][] = sprintf($this->l('Invalid unit price for %s.'), $objGlobalDemand->name);
- }
- }
- if (!$response['hasError']) {
- foreach ($roomDemands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $idHtlBooking;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
- $objBookingDemand->unit_price_tax_excl = $demand['unit_price'];
- $objBookingDemand->unit_price_tax_incl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 1,
- 6,
- null,
- null,
- null,
- null,
- $demand['unit_price']
- );
- $numDays = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- }
- $objBookingDemand->total_price_tax_excl = $totalPriceTaxExcl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = $totalPriceTaxIncl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
- $res &= $order_invoice->update();
- }
-
- $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
- );
- $taxCalc = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalc->computation_method;
- if ($objBookingDemand->save()) {
- $objBookingDemand->tax_calculator = $taxCalc;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
-
- $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
- if ($order->save()) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- } else {
- $response['hasError'] = true;
- $response['errors'][] = Tools::displayError('You do not have permission to edit this order.');
- }
- die(json_encode($response));
- }
-
- public function ajaxProcessUpdateRoomExtraDemands()
- {
- $response = array('success' => false);
- if ($this->tabAccess['edit'] === 1) {
- if ($idBookingDemand = Tools::getValue('id_booking_demand')) {
- if (Validate::isLoadedObject($objBookingDemand = new HotelBookingDemands($idBookingDemand))) {
- $unitPrice = Tools::getValue('unit_price');
- if (!$unitPrice || !ValidateCore::isPrice($unitPrice)) {
- $response['hasError'] = true;
- $response['errors'] = $this->l('Invalid unit price');
- }
- $oldPriceTaxExcl = $objBookingDemand->unit_price_tax_excl;
- $oldPriceTaxIncl = $objBookingDemand->unit_price_tax_incl;
- if ($oldPriceTaxExcl > 0) {
- $oldTaxMultiplier = $oldPriceTaxIncl / $oldPriceTaxExcl;
- } else {
- $oldTaxMultiplier = 1;
- }
-
- $objBookingDemand->unit_price_tax_excl = $unitPrice;
- $objBookingDemand->unit_price_tax_incl = $unitPrice * $oldTaxMultiplier;
-
- $objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking);
- $order = new Order($objBookingDetail->id_order);
- if ($objBookingDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
-
- $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- } else {
- $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
- $objBookingDemand->unit_price_tax_excl,
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(
- $objBookingDemand->unit_price_tax_incl,
- 1,
- $order->round_type,
- $order->round_mode
- );
- }
- if ($objBookingDemand->save()) {
- $objBookingDemand->setBookingDemandTaxDetails(1);
-
- $priceDiffTaxExcl = $objBookingDemand->total_price_tax_excl - $oldPriceTaxExcl;
- $priceDiffTaxIncl = $objBookingDemand->total_price_tax_incl - $oldPriceTaxIncl;
-
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->update();
- }
-
- $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid = Tools::ps_round((float)($order->total_paid + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- if ($order->save()) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- die(json_encode($response));
- }
-
- // delete room extra demand while order edit
- public function ajaxProcessDeleteRoomExtraDemand()
- {
- $response = array('success' => false);
- // Check tab access is allowed to edit
- if ($this->tabAccess['edit'] === 1) {
- $res = true;
- if ($idBookingDemand = Tools::getValue('id_booking_demand')) {
- if (Validate::isLoadedObject($objBookingDemand = new HotelBookingDemands($idBookingDemand))) {
- // first delete the tax details of the booking demand
- if ($objBookingDemand->deleteBookingDemandTaxDetails($idBookingDemand)) {
- if ($objBookingDemand->delete()) {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking))) {
- // change order total
- $order = new Order($objBookingDetail->id_order);
-
- $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
-
- $order->save();
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl - $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl - $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
- $res &= $order_invoice->update();
- }
- if ($res) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- }
- }
-
- die(json_encode($response));
- }
-
public function ajaxProcessUpdateServiceProduct()
{
$operator = Tools::getValue('operator', 'up');
@@ -9058,4 +8932,133 @@ class AdminOrdersControllerCore extends AdminController
$this->ajaxDie(json_encode($result));
}
+
+ /**
+ *
+ * @param int $idHtlBooking
+ * @param int $idRoomProduct
+ * @param array|null $bookingTourismTaxStatus
+ * @return int OrderTaxDetail::STATUS_APPLIED|STATUS_NOT_APPLICABLE|STATUS_NONE
+ */
+ protected static function combinedRoomTourismTaxStatus($idHtlBooking, $idRoomProduct, $bookingTourismTaxStatus, $serviceTourismTaxTotal)
+ {
+ $roomApplied = $bookingTourismTaxStatus && $bookingTourismTaxStatus['status'] === OrderTaxDetail::STATUS_APPLIED;
+ if ($roomApplied || $serviceTourismTaxTotal > 0) {
+ return OrderTaxDetail::STATUS_APPLIED;
+ }
+
+ $roomHasRule = (bool) Product::getIdTourismTaxRulesGroupByIdProduct((int) $idRoomProduct);
+ $serviceHasRule = false;
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail((int) $idHtlBooking) as $idServiceLine) {
+ $serviceLine = new ServiceProductOrderDetail($idServiceLine);
+ if (Validate::isLoadedObject($serviceLine) && Product::getIdTourismTaxRulesGroupByIdProduct((int) $serviceLine->id_product)) {
+ $serviceHasRule = true;
+ break;
+ }
+ }
+
+ return ($roomHasRule || $serviceHasRule) ? OrderTaxDetail::STATUS_NONE : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+
+ /**
+ * Map per-booking tourism tax apply/exempt failures (whole-order bulk case) to deduplicated messages.
+ *
+ * @param array $failures
+ * @param array $messagesByResult
+ * @return string[]
+ */
+ protected static function tourismTaxErrorsFromResults(array $failures, array $messagesByResult)
+ {
+ $messages = array();
+ foreach ($failures as $failure) {
+ if (!isset($messagesByResult[$failure['result']])) {
+ continue;
+ }
+ $messages[$failure['result']] = $messagesByResult[$failure['result']];
+ }
+ return array_values($messages);
+ }
+
+ /**
+ * Apply tourism tax to a booking (id_htl_booking), a standalone service line
+ * (id_service_product_order_detail), or every booking of a whole order (id_order) —
+ * see OrderTaxDetail::applyBooking()/applyServiceLine().
+ */
+ public function ajaxProcessApplyTourismTax()
+ {
+ $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
+ $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ $idOrder = (int) Tools::getValue('id_order', 0);
+ $idEmployee = (int) Context::getContext()->employee->id;
+ $autoMsgLabel = $this->l('Tourism Tax Applied');
+ $errors = array();
+ $messagesByResult = array(
+ OrderTaxDetail::APPLY_ERROR_RESTORE => $this->l('Could not restore tourism tax.'),
+ OrderTaxDetail::APPLY_ERROR_NOT_APPLICABLE => $this->l('Tourism tax is not applicable for this booking.'),
+ );
+
+ if ($idHtlBooking) {
+ $result = OrderTaxDetail::applyBooking($idHtlBooking, $idEmployee, $autoMsgLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idServiceProductOrderDetail) {
+ $result = OrderTaxDetail::applyServiceLine($idServiceProductOrderDetail, $idEmployee, $autoMsgLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idOrder) {
+ $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::applyForOrder($idOrder, $idEmployee, $autoMsgLabel), $messagesByResult);
+ } else {
+ $errors[] = $this->l('Invalid request parameters.');
+ }
+
+ die(Tools::jsonEncode(array(
+ 'hasError' => !empty($errors),
+ 'errors' => $errors,
+ )));
+ }
+
+ /**
+ * Exempt tourism tax for a booking (id_htl_booking), a standalone service line
+ * (id_service_product_order_detail), or every booking of a whole order (id_order) —
+ * see OrderTaxDetail::exemptBooking()/exemptServiceLine().
+ */
+ public function ajaxProcessExemptTourismTax()
+ {
+ $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
+ $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ $idOrder = (int) Tools::getValue('id_order', 0);
+ $idEmployee = (int) Context::getContext()->employee->id;
+ $note = trim((string) Tools::getValue('note', ''));
+ $note = ($note !== '') ? $note : null;
+ $autoMsgLabel = $this->l('Tourism Tax Exempted');
+ $remarkLabel = $this->l('Remark');
+ $errors = array();
+ $messagesByResult = array(
+ OrderTaxDetail::EXEMPT_ERROR_NO_RULE => $this->l('Tourism tax exemption is not applicable for this line.'),
+ OrderTaxDetail::EXEMPT_ERROR_SAVE => $this->l('Could not exempt tourism tax.'),
+ );
+
+ if ($idHtlBooking) {
+ $result = OrderTaxDetail::exemptBooking($idHtlBooking, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idServiceProductOrderDetail) {
+ $result = OrderTaxDetail::exemptServiceLine($idServiceProductOrderDetail, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idOrder) {
+ $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::exemptForOrder($idOrder, $idEmployee, $note, $autoMsgLabel, $remarkLabel), $messagesByResult);
+ } else {
+ $errors[] = $this->l('Invalid request parameters.');
+ }
+
+ die(Tools::jsonEncode(array(
+ 'hasError' => !empty($errors),
+ 'errors' => $errors,
+ )));
+ }
}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 79499ce6b..66b70e3e9 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -112,7 +112,6 @@ class AdminProductsControllerCore extends AdminController
'Configuration' => $this->l('Rooms'),
'Occupancy' => $this->l('Occupancy'),
'LengthOfStay' => $this->l('Length of Stay'),
- 'AdditionalFacilities' => $this->l('Additional Facilities'),
);
if ($this->context->shop->getContext() != Shop::CONTEXT_GROUP) {
@@ -128,7 +127,6 @@ class AdminProductsControllerCore extends AdminController
'Occupancy' => 8,
'ServiceProduct' => 9,
'LengthOfStay' => 10,
- 'AdditionalFacilities' => 11,
));
}
@@ -232,7 +230,6 @@ class AdminProductsControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (pd.`id_product` = a.`id_product` AND pd.`active` = 1)
LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)
LEFT JOIN `'._DB_PREFIX_.'feature_product` fp ON (fp.`id_product` = a.`id_product`)
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_demand` hrtd ON (hrtd.`id_product` = a.`id_product`)
LEFT JOIN (
SELECT rsp.*, GROUP_CONCAT(pl.`name`) AS service_products
FROM `'._DB_PREFIX_.'htl_room_type_service_product` rsp
@@ -245,7 +242,7 @@ class AdminProductsControllerCore extends AdminController
$this->_select .= ' a.`show_at_front`, (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, ';
$this->_select .= 'hrt.`adults`, hrt.`children`, hrt.`max_guests`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, ';
$this->_select .= 'shop.`name` AS `shopname`, a.`id_shop_default`, ';
- $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`';
+ $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`, a.`id_tourism_tax_rules_group`';
$this->_select .= ', IFNULL(hap.`active`, 0) AS advance_payment';
$this->_select .= ', IF(IFNULL(hap.`active`, 0), 1, 0) badge_success, IF(IFNULL(hap.`active`, 0), 0, 1) badge_danger ';
@@ -435,23 +432,6 @@ class AdminProductsControllerCore extends AdminController
'displayed' => false,
);
- $additionalFacilities = array();
- $objHotelRoomTypeGlobalDemand = new HotelRoomTypeGlobalDemand();
- $demands = $objHotelRoomTypeGlobalDemand->getAllDemands();
- foreach ($demands as $demand) {
- $additionalFacilities[$demand['id_global_demand']] = $demand['name'];
- }
- $this->fields_list['id_global_demand'] = array(
- 'title' => $this->l('Additional Facilities'),
- 'align' => 'text-center',
- 'type' => 'select',
- 'multiple' => true,
- 'operator' => 'and',
- 'filter_key' => 'hrtd!id_global_demand',
- 'list' => $additionalFacilities,
- 'displayed' => false,
- );
-
$this->locationsAndHotels = array();
$idLocationsCategory = Configuration::get('PS_LOCATIONS_CATEGORY');
$this->objLocationsCategory = new Category($idLocationsCategory, $this->context->language->id);
@@ -665,13 +645,13 @@ class AdminProductsControllerCore extends AdminController
{
$prefix = $this->getCookieFilterPrefix();
$orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($prefix.$this->table.'Orderby') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
- $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'ASC') : $orderWay);
+ $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderway') : 'ASC') : $orderWay);
if ($orderByPriceFinal == 'price_final') {
$orderBy = 'id_'.$this->table;
$orderWay = 'ASC';
}
if ($this->action == 'export' && empty($this->_listsql)) {
- $this->_select .= ' , trg.`name` AS `id_tax_rules_group`, `features`, hrtdl.`global_demands`';
+ $this->_select .= ' , trg.`name` AS `id_tax_rules_group`, `features`';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'tax_rules_group` trg
ON trg.`id_tax_rules_group` = a.`id_tax_rules_group`
LEFT JOIN (SELECT GROUP_CONCAT(fpl.`name`) AS features, fp.`id_product`
@@ -682,14 +662,6 @@ class AdminProductsControllerCore extends AdminController
GROUP BY fp.`id_product`
) AS fpl ON (a.`id_product` = fpl.`id_product`)';
- $this->_join .= ' LEFT JOIN (SELECT hrtgd.`id_product`, `id_lang`, GROUP_CONCAT(`name`) AS `global_demands`
- FROM `'._DB_PREFIX_.'htl_room_type_global_demand_lang` hrtgdl
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_demand` hrtgd
- ON hrtgd.`id_global_demand` = hrtgdl.`id_global_demand`
- WHERE `id_lang`='.(int) $this->context->language->id.'
- GROUP BY hrtgd.`id_product`
- ) AS hrtdl ON (hrtdl.`id_product` = a.`id_product`)';
-
$this->fields_list = array_merge($this->fields_list, array(
'id_tax_rules_group' => array(
'title' => $this->l('Id Tax Rules group'),
@@ -701,35 +673,59 @@ class AdminProductsControllerCore extends AdminController
'service_products' => array(
'title' => $this->l('Services Products'),
),
- 'global_demands' => array(
- 'title' => $this->l('Additional Facilities'),
- )
)
);
unset($this->fields_list['id_category_default']);
- unset($this->fields_list['id_global_demand']);
unset($this->fields_list['id_feature']);
unset($this->fields_list['id_service_product']);
}
- parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $this->context->shop->id);
+ parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $id_lang_shop ?: $this->context->shop->id);
/* update product quantity with attributes ...*/
$nb = count($this->_list);
if ($this->_list) {
$context = $this->context->cloneContext();
$context->shop = clone($context->shop);
+ $isAllShopsContext = (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP);
+ $priceDisplayPrecision = (int) Configuration::get('PS_PRICE_DISPLAY_PRECISION');
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $todayDate = date('Y-m-d');
+ $tomorrowDate = date('Y-m-d', strtotime('+1 day', strtotime($todayDate)));
+
/* update product final price */
for ($i = 0; $i < $nb; $i++) {
- if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP) {
+ if ($isAllShopsContext) {
$context->shop = new Shop((int)$this->_list[$i]['id_shop_default']);
}
// convert price with the currency from context
$this->_list[$i]['price'] = Tools::convertPrice($this->_list[$i]['price'], $this->context->currency, true, $this->context);
$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null,
- (int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, $nothing, true, true,
+ $priceDisplayPrecision, null, false, true, 1, true, null, null, null, $nothing, true, true,
$context);
+
+ $idTourismTaxRulesGroup = (int) $this->_list[$i]['id_tourism_tax_rules_group'];
+ $idHotel = (int) $this->_list[$i]['id_hotel'];
+ if ($useTourismTax && $idTourismTaxRulesGroup && $idHotel) {
+ $idProduct = $this->_list[$i]['id_product'];
+ $vatAddress = new Address(HotelRoomType::getHotelIdAddressByIdProduct($idProduct));
+ $vatCalculator = TaxManagerFactory::getManager($vatAddress, Product::getIdTaxRulesGroupByIdProduct($idProduct))->getTaxCalculator();
+ $unitPriceTaxExcl = $vatCalculator->removeTaxes($this->_list[$i]['price_tmp']);
+
+ $hotelTaxContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, $vatAddress);
+ $taxCalculator = TaxManagerFactory::getManager($hotelTaxContext['address'], $idTourismTaxRulesGroup)->getTaxCalculator();
+ $this->_list[$i]['price_tmp'] += $taxCalculator->getTaxesTotalAmount(
+ $unitPriceTaxExcl,
+ $todayDate,
+ 1,
+ 1,
+ array(),
+ $hotelTaxContext['collectionType'],
+ 1,
+ $this->context->currency->id
+ );
+ }
}
}
@@ -967,11 +963,6 @@ class AdminProductsControllerCore extends AdminController
)) {
$this->errors[] = Tools::displayError('An error occurred while duplicating rooms.');
}
- if (!HotelRoomTypeDemand::duplicateRoomTypeDemands($id_product_old, $product->id)) {
- $this->errors[] = Tools::displayError(
- 'An error occurred while duplicating additional facilities.'
- );
- }
} else {
$this->errors[] = Tools::displayError('An error occurred while duplicating room type.');
}
@@ -2261,9 +2252,6 @@ class AdminProductsControllerCore extends AdminController
if ($this->isTabSubmitted('Configuration')) {
$this->processConfiguration();
}
- if ($this->isTabSubmitted('AdditionalFacilities')) {
- $this->processAdditionalFacilities();
- }
// $this->updatePackItems($object);
// Disallow avanced stock management if the product become a pack
@@ -3303,7 +3291,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRuleGroup = new TaxRulesGroup(
$serviceProductPriceInfo['id_tax_rules_group'],
$this->context->language->id
- ))) {
+ )) && !$objTaxRuleGroup->is_tourism_tax_rule_group) {
$associationInfo['tax_rules_group_name'] = $objTaxRuleGroup->name;
}
$associationInfo['id_room_type_service_product_price'] = $serviceProductPriceInfo['id_room_type_service_product_price'];
@@ -3313,7 +3301,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRuleGroup = new TaxRulesGroup(
$objProduct->id_tax_rules_group,
$this->context->language->id
- ))) {
+ )) && !$objTaxRuleGroup->is_tourism_tax_rule_group) {
$associationInfo['default_tax_rules_group_name'] = $objTaxRuleGroup->name;
}
@@ -3327,7 +3315,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRulesGroup = new TaxRulesGroup(
$serviceProduct['id_tax_rules_group'],
$this->context->language->id
- ))) {
+ )) && !$objTaxRulesGroup->is_tourism_tax_rule_group) {
$serviceProduct['tax_rules_group_name'] = $objTaxRulesGroup->name;
}
@@ -3834,136 +3822,6 @@ class AdminProductsControllerCore extends AdminController
die(json_encode($response));
}
- public function initFormAdditionalFacilities($obj)
- {
- $data = $this->createTemplate($this->tpl_form);
-
- if ($obj->id) {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand();
- $allDemands = $objGlobalDemand->getAllDemands();
- foreach($allDemands as &$demand) {
- if ($demand['id_tax_rules_group'] == 0) {
- $demand['default_tax_rules_group_name'] = 'No tax';
- } else {
- $objTaxRuleGroup = new TaxRulesGroup(
- $demand['id_tax_rules_group'],
- $this->context->language->id
- );
- $demand['default_tax_rules_group_name'] = $objTaxRuleGroup->name;
- }
- }
- $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-
- // get room type additional facilities
- $objRoomDemand = new HotelRoomTypeDemand();
- $selectedDemands = $objRoomDemand->getRoomTypeDemands($obj->id, 0, 0);
-
- $data->assign(array(
- 'product' => $obj,
- 'selectedDemands' => $selectedDemands,
- 'allDemands' => $allDemands,
- 'defaultcurrencySign' => $objCurrency->sign,
- 'idDefaultcurrency' => $objCurrency->id,
- ));
- } else {
- $this->displayWarning($this->l('You must save this room type before managing additional facilities.'));
- }
-
- $this->tpl_form_vars['custom_form'] = $data->fetch();
- }
-
- public function processAdditionalFacilities()
- {
- if ($idProduct = Tools::getValue('id_product')) {
- $errors = array();
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- // first delete all the previously saved prices and demands of this room type
- $objRoomTypeDemand->deleteRoomTypeDemands($idProduct);
- $objRoomTypeDemandPrice->deleteRoomTypeDemandPrices($idProduct);
- if ($selectedDemands = Tools::getValue('selected_demand')) {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- foreach ($selectedDemands as $idGlobalDemand) {
- if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand))) {
- // save selected demands for this room type
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $idProduct;
- $objRoomTypeDemand->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemand->save();
-
- // save selected demands prices for this room type
- $demandPrice = Tools::getValue('demand_price_'.$idGlobalDemand);
- if (Validate::isPrice($demandPrice)) {
- if ($objGlobalDemand->price != $demandPrice) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $idProduct;
- $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemandPrice->id_option = 0;
- $objRoomTypeDemandPrice->price = $demandPrice;
- $objRoomTypeDemandPrice->save();
- }
- } else {
- $errors[] = Tools::displayError('Invalid demand price of facility.').
- ' : '.$objGlobalDemand->name[$this->context->language->id];
- }
- if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) {
- foreach ($advOptions as $option) {
- if (Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($option['id']))) {
- $optionPrice = Tools::getValue('option_price_'.$option['id']);
- if (Validate::isPrice($optionPrice)) {
- if ($optionPrice != $objAdvOption->price) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $idProduct;
- $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemandPrice->id_option = $option['id'];
- $objRoomTypeDemandPrice->price = $optionPrice;
- $objRoomTypeDemandPrice->save();
- }
- } else {
- $errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id];
- }
- }
- }
- }
- }
- }
- if (count($errors)) {
- $this->warnings[] = Tools::displayError('Invalid price values for additional facilities were not saved. Please correct them and try again.');
- $this->errors = array_merge($this->errors, $errors);
- }
-
- $objCartBookingData = new HotelCartBookingData();
- if ($cartExtraDemands = $objCartBookingData->getCartExtraDemands(0, $idProduct)) {
- // delete the demands from cart if not available in cart
- $objRoomDemand = new HotelRoomTypeDemand();
- $roomTypeDemandIds = array();
- if ($roomTypeDemands = $objRoomDemand->getRoomTypeDemands($idProduct)) {
- $roomTypeDemandIds = array_keys($roomTypeDemands);
- }
- foreach ($cartExtraDemands as &$demandInfo) {
- if (isset($demandInfo['extra_demands']) && $demandInfo['extra_demands']) {
- $cartChanged = 0;
- foreach ($demandInfo['extra_demands'] as $key => $demand) {
- if (!in_array($demand['id_global_demand'], $roomTypeDemandIds)) {
- $cartChanged = 1;
- unset($demandInfo['extra_demands'][$key]);
- }
- }
- if ($cartChanged) {
- if (Validate::isLoadedObject(
- $objCartBooking = new HotelCartBookingData($demandInfo['id'])
- )) {
- $objCartBooking->extra_demands = json_encode($demandInfo['extra_demands']);
- $objCartBooking->save();
- }
- }
- }
- }
- }
- }
- }
- }
-
/**
* @param Product $obj
*
@@ -4192,6 +4050,25 @@ class AdminProductsControllerCore extends AdminController
$data->assign('productFeaturePrices', $productFeaturePrices);
}
+ if (Configuration::get('QLO_USE_TOURISM_TAX') && !Tax::excludeTaxeOption()) {
+ $tourismTaxRulesGroups = TaxRulesGroup::getTaxRulesGroupsForOptions(true, true);
+ $data->assign('tourismTaxRulesGroups', $tourismTaxRulesGroups);
+ $data->assign('id_tourism_tax_rules_group', isset($product->id_tourism_tax_rules_group) ? (int) $product->id_tourism_tax_rules_group : 0);
+
+ $roomTypeInfo = (new HotelRoomType())->getRoomTypeInfoByIdProduct((int) $product->id);
+ $idHotel = $roomTypeInfo ? (int) $roomTypeInfo['id_hotel'] : 0;
+ $collectionType = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, $address)['collectionType'];
+
+ $tourismTaxRates = array();
+ foreach ($tourismTaxRulesGroups as $tourismTaxRulesGroup) {
+ if (!$tourismTaxRulesGroup['id_tax_rules_group']) {
+ continue;
+ }
+ $tourismTaxRates[$tourismTaxRulesGroup['id_tax_rules_group']] = TaxConfiguration::getPreviewParams($tourismTaxRulesGroup['id_tax_rules_group'], $address, $this->context->language->id, $collectionType);
+ }
+ $data->assign('tourismTaxRatesByGroup', $tourismTaxRates);
+ }
+
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index c2ac5e28f..876780463 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -36,7 +36,6 @@ class AdminSearchControllerCore extends AdminController
'AdminFeatures' => 1,
'AdminOrders' => 1,
'AdminOrderRefundRules' => 1,
- 'AdminRoomTypeGlobalDemand' => 1,
'AdminGroups' => 1,
'AdminHotelAmenities' => 1,
'AdminCustomers' => 1,
@@ -191,7 +190,6 @@ class AdminSearchControllerCore extends AdminController
if (!$searchType) {
$this->searchAddress();
$this->searchHotelAmenities();
- $this->searchAdditionalFacilities();
$this->searchRefundRules();
}
}
@@ -436,6 +434,7 @@ class AdminSearchControllerCore extends AdminController
if ($hotelAmenities = $objHotelAmenities->searchByName($this->query, $this->context->language->id)) {
$amenities = array();
foreach ($hotelAmenities as $key => $hotelAmenity) {
+ $amenities[$hotelAmenity['id_amenity']]['id_amenity'] = $hotelAmenity['id_amenity'];
$amenities[$hotelAmenity['id_amenity']]['name'] = $hotelAmenity['name'];
if ($hotelAmenity['id_parent']) {
$amenities[$hotelAmenity['id_amenity']]['id'] = $hotelAmenity['id_parent'];
@@ -450,29 +449,6 @@ class AdminSearchControllerCore extends AdminController
}
}
- public function searchAdditionalFacilities()
- {
- if (class_exists('HotelRoomTypeGlobalDemand')) {
- if (isset($this->controllerAccess['AdminRoomTypeGlobalDemand']) && $this->controllerAccess['AdminRoomTypeGlobalDemand']) {
- $objHotelRoomTypeGlobalDemands = new HotelRoomTypeGlobalDemand();
- if ($globalDemads = $objHotelRoomTypeGlobalDemands->searchByName($this->query, $this->context->language->id)) {
- foreach ($globalDemads as $key => $demand) {
- if (!(int) $globalDemads[$key]['price']) {
- $globalDemads[$key]['price'] = $globalDemads[$key]['option_price'];
- }
-
- $globalDemads[$key]['per_day_price_calc'] = $this->l('No');
- if ($globalDemads[$key]['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $globalDemads[$key]['per_day_price_calc'] = $this->l('Yes');
- }
- }
-
- $this->_list['global_demands'] = $globalDemads;
- }
- }
- }
- }
-
public function searchRefundRules()
{
if (class_exists('HotelOrderRefundRules')) {
@@ -559,18 +535,6 @@ class AdminSearchControllerCore extends AdminController
);
}
- protected function initGlobalDemandList()
- {
- $this->show_toolbar = false;
- $this->fields_list['global_demands'] = array(
- 'id_global_demand' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
- 'name' => array('title' => $this->l('Name')),
- 'option_name' => array('title' => $this->l('Advance Option Name')),
- 'price' => array('title' => $this->l('Price'), 'type' => 'price', 'currency' => true),
- 'per_day_price_calc' => array('title' => $this->l('Per day price calculation'))
- );
- }
-
protected function initRefundRuleList()
{
$this->show_toolbar = false;
@@ -854,10 +818,10 @@ class AdminSearchControllerCore extends AdminController
$helper = new HelperList();
$helper->shopLinkType = '';
$helper->simple_header = true;
- $helper->identifier = 'id_customer_message';
- $helper->actions = array('edit');
+ $helper->identifier = 'id_customer_thread';
+ $helper->actions = array('view');
$helper->show_toolbar = false;
- $helper->table = 'feature';
+ $helper->table = 'customer_thread';
$helper->currentIndex = $this->context->link->getAdminLink('AdminCustomerThreads', false);
$query = trim(Tools::getValue('bo_query'));
@@ -980,27 +944,6 @@ class AdminSearchControllerCore extends AdminController
$this->tpl_view_vars['groups'] = $view;
}
- if (isset($this->_list['global_demands']) && count($this->_list['global_demands'])) {
- $view = '';
- $this->initGlobalDemandList();
- $helper = new HelperList();
- $helper->shopLinkType = '';
- $helper->simple_header = true;
- $helper->identifier = 'id_global_demand';
- $helper->actions = array('edit');
- $helper->show_toolbar = false;
- $helper->table = 'htl_room_type_global_demand';
- $helper->currentIndex = $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand', false);
- $helper->token = Tools::getAdminTokenLite('AdminRoomTypeGlobalDemand');
-
- if ($this->_list['global_demands']) {
- $view = $helper->generateList($this->_list['global_demands'], $this->fields_list['global_demands']);
- }
-
- $this->tpl_view_vars['num_global_demands'] = count($this->_list['global_demands']);
- $this->tpl_view_vars['global_demands'] = $view;
- }
-
if (isset($this->_list['refund_rules']) && count($this->_list['refund_rules'])) {
$view = '';
$this->initRefundRuleList();
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index e08d8c6dd..a93ca9f3e 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -560,29 +560,11 @@ public function initPageHeaderToolbar()
$objHotelBookingDetail = new HotelBookingDetail();
$bookingDetails = $objHotelBookingDetail->getBookingDataByOrderId($idOrder);
- $objBookingDemands = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
foreach ($bookingDetails as &$booking) {
$booking['extra_service_total_price_tax_incl'] = 0;
- $extraDemands = $objBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 0,
- 1,
- $booking['id']
- );
- if ($extraDemands) {
- foreach ($extraDemands as $demand) {
- $booking['extra_service_total_price_tax_incl'] += (float) $demand['total_price_tax_incl'];
- }
- }
-
$roomServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0, 0, 0, 0, 0, 0, 0, 0, null, null, null, 0, $booking['id']
);
diff --git a/controllers/admin/AdminSourcesController.php b/controllers/admin/AdminSourcesController.php
new file mode 100644
index 000000000..c51d5dd36
--- /dev/null
+++ b/controllers/admin/AdminSourcesController.php
@@ -0,0 +1,850 @@
+bootstrap = true;
+ $this->table = 'business_source';
+ $this->className = 'BusinessSource';
+ $this->identifier = 'id_business_source';
+ $this->list_id = 'business_source';
+ $this->lang = true;
+ $this->deleted = false;
+ $this->_defaultOrderBy = 'position';
+ $this->_defaultOrderWay = 'ASC';
+ $this->context = Context::getContext();
+ $this->_new_list_header_design = true;
+ $this->bulk_actions = array(
+ 'delete' => array(
+ 'text' => $this->l('Delete selected'),
+ 'icon' => 'icon-trash',
+ 'confirm' => $this->l('Delete selected items?')
+ )
+ );
+
+ parent::__construct();
+ }
+
+ public function setMedia()
+ {
+ parent::setMedia();
+
+ $this->addJS(_PS_JS_DIR_.'admin/sources.js');
+ }
+
+ public function init()
+ {
+ if (Tools::isSubmit('addsource') || Tools::isSubmit('addbusiness_source')) {
+ $this->display = 'add';
+ }
+ if (Tools::isSubmit('updatesource') || Tools::isSubmit('updatebusiness_source')) {
+ $this->display = 'edit';
+ }
+ if (Tools::isSubmit('submitAddsource') || Tools::isSubmit('submitAddsourceAndStay')) {
+ $this->display = Tools::getValue('id_source') ? 'edit' : 'add';
+ }
+ if (Tools::isSubmit('submitAddbusiness_source') || Tools::isSubmit('submitAddbusiness_sourceAndStay')) {
+ $this->display = Tools::getValue('id_business_source') ? 'edit' : 'add';
+ }
+
+ return parent::init();
+ }
+
+ public function initContent()
+ {
+ if (Tools::isSubmit('submitFiltersource') || Tools::isSubmit('submitResetsource')) {
+ $this->list_id = 'source';
+ $this->display = 'view';
+
+ $idBusinessSource = (int) Tools::getValue('id_business_source');
+ self::$currentIndex .= '&id_business_source=' . $idBusinessSource . '&viewbusiness_source';
+ if (Tools::isSubmit('submitResetsource')) {
+ $this->processResetFilters('source');
+ }
+ }
+ parent::initContent();
+ }
+
+ /**
+ * @see AdminController::initPageHeaderToolbar()
+ */
+ public function initPageHeaderToolbar()
+ {
+ if (empty($this->display)) {
+ $this->page_header_toolbar_btn['new_business_source'] = array(
+ 'href' => self::$currentIndex.'&addbusiness_source&token='.$this->token,
+ 'desc' => $this->l('Add new Business Source', null, null, false),
+ 'icon' => 'process-icon-new'
+ );
+ } elseif ($this->display == 'view') {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ if ($idBusinessSource) {
+ $this->page_header_toolbar_btn['new_source'] = array(
+ 'href' => self::$currentIndex.'&addsource&id_business_source='.$idBusinessSource.'&token='.$this->token,
+ 'desc' => $this->l('Add new Booking Source', null, null, false),
+ 'icon' => 'process-icon-new'
+ );
+ $this->page_header_toolbar_btn['back_to_business'] = array(
+ 'href' => self::$currentIndex.'&token='.$this->token,
+ 'desc' => $this->l('Back To Business Source', null, null, false),
+ 'icon' => 'process-icon-back'
+ );
+ }
+ }
+
+ unset($this->toolbar_btn['back']);
+ parent::initPageHeaderToolbar();
+ }
+
+
+
+ protected function initBusinessSourcesList()
+ {
+ $this->fields_list = array(
+ 'id_business_source' => array(
+ 'title' => $this->l('ID'),
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs'
+ ),
+ 'name' => array(
+ 'title' => $this->l('Name'),
+ 'width' => 'auto',
+ 'filter_key' => 'b!name'
+ ),
+ 'code' => array(
+ 'title' => $this->l('Code'),
+ 'align' => 'text-center'
+ ),
+ 'position' => array(
+ 'title' => $this->l('Position'),
+ 'filter_key' => 'a!position',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'position' => 'position'
+ ),
+ 'orders_count' => array(
+ 'title' => $this->l('Orders (%)'),
+ 'align' => 'text-center',
+ 'orderby' => false,
+ 'search' => false,
+ 'callback' => 'formatOrdersPercentage',
+ ),
+ 'active' => array(
+ 'title' => $this->l('Enabled'),
+ 'active' => 'status',
+ 'type' => 'bool',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'orderby' => false
+ ),
+ );
+ }
+
+ protected function initSourcesList()
+ {
+ $this->fields_list = array(
+ 'id_source' => array(
+ 'title' => $this->l('ID'),
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs'
+ ),
+ 'name' => array(
+ 'title' => $this->l('Booking Source'),
+ 'width' => 'auto',
+ 'filter_key' => 'b!name'
+ ),
+ 'source_type_name' => array(
+ 'title' => $this->l('Business Source'),
+ 'orderby' => false,
+ 'search' => false,
+ ),
+ 'code' => array(
+ 'title' => $this->l('Code'),
+ 'align' => 'text-center'
+ ),
+ 'position' => array(
+ 'title' => $this->l('Position'),
+ 'filter_key' => 'a!position',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'position' => 'position'
+ ),
+ 'orders_count' => array(
+ 'title' => $this->l('Orders (%)'),
+ 'align' => 'text-center',
+ 'orderby' => false,
+ 'search' => false,
+ 'callback' => 'formatOrdersPercentage',
+ ),
+ 'active' => array(
+ 'title' => $this->l('Enabled'),
+ 'active' => 'status',
+ 'type' => 'bool',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'orderby' => false
+ ),
+ );
+ }
+
+ public function renderList()
+ {
+ $this->addRowAction('view');
+ $this->addRowAction('edit');
+ $this->addRowAction('delete');
+
+ $this->addRowActionSkipList('delete', BusinessSource::getUnremovableIds());
+ $this->_where = 'AND a.`deleted` = 0';
+ $this->_select = '(SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o
+ INNER JOIN `'._DB_PREFIX_.'source` s ON s.`id_source` = o.`id_source`
+ WHERE s.`id_business_source` = a.`id_business_source`) AS `orders_count`';
+ $this->ordersTotal = Source::getTotalOrderCount();
+ $this->initBusinessSourcesList();
+ $this->toolbar_title = $this->l('Business Source');
+
+ return parent::renderList();
+ }
+
+ public function renderView()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $objBusinessSource = new BusinessSource($idBusinessSource, (int)$this->context->language->id);
+ if (!Validate::isLoadedObject($objBusinessSource)) {
+ Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
+ }
+ $this->viewBusinessSource = $objBusinessSource;
+
+ $this->addRowAction('edit');
+ $this->addRowAction('merge');
+ $this->addRowAction('delete');
+ $this->addRowActionSkipList('delete', Source::getUnremovableIds());
+
+ $this->table = 'source';
+ $this->className = 'Source';
+ $this->identifier = 'id_source';
+ $this->list_id = 'source';
+ $this->_select = 'bsl.`name` AS `source_type_name`,
+ (SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o WHERE o.`id_source` = a.`id_source`) AS `orders_count`';
+ $this->ordersTotal = $objBusinessSource->getOrderCount();
+ $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'business_source` bs ON (bs.`id_business_source` = a.`id_business_source`)';
+ $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl ON (bsl.`id_business_source` = bs.`id_business_source` AND bsl.`id_lang` = '.(int)$this->context->language->id.')';
+ $this->_where = 'AND a.`deleted` = 0 AND a.`id_business_source` = '.(int)$objBusinessSource->id;
+ $this->initSourcesList();
+
+ $this->processFilter();
+ $list = parent::renderList();
+
+ $this->page_header_toolbar_title = $this->l('Business Source:').' '.$objBusinessSource->name;
+ $this->toolbar_title = $this->getSourcesListTitle();
+
+ return $list;
+ }
+
+ protected function getSourcesListTitle()
+ {
+ if (!Validate::isLoadedObject($this->viewBusinessSource)) {
+ return $this->l('Booking Sources');
+ }
+
+ return $this->viewBusinessSource->name.' '.$this->_listTotal.'';
+ }
+
+ public function getTemplateListVars()
+ {
+ $vars = parent::getTemplateListVars();
+
+ if ($this->display == 'view' && $this->table == 'source') {
+ $vars['title'] = $this->getSourcesListTitle();
+ }
+
+ return $vars;
+ }
+
+ public function renderForm()
+ {
+ if (Tools::isSubmit('updatesource')
+ || Tools::isSubmit('addsource')
+ || Tools::isSubmit('submitAddsource')
+ || Tools::isSubmit('submitAddsourceAndStay')
+ ) {
+ return $this->renderSourceForm();
+ }
+
+ return $this->renderBusinessSourceForm();
+ }
+
+ protected function renderBusinessSourceForm()
+ {
+ if (!($objBusinessSource = $this->loadObject(true))) {
+ return;
+ }
+
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Business Source'),
+ 'icon' => 'icon-edit'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'lang' => true,
+ 'required' => true,
+ 'hint' => $this->l('Invalid characters:').' <>;=#{}'
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Code'),
+ 'name' => 'code',
+ 'required' => true,
+ 'class' => 'fixed-width-xl',
+ 'readonly' => (bool)$objBusinessSource->id,
+ 'hint' => $objBusinessSource->id
+ ? $this->l('The code cannot be changed after creation.')
+ : $this->l('A short unique machine code, e.g. "OTA". Letters, numbers, underscores and hyphens only.')
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Enabled'),
+ 'name' => 'active',
+ 'required' => false,
+ 'class' => 't',
+ 'is_bool' => true,
+ 'default_value' => 1,
+ 'values' => array(
+ array('id' => 'active_on', 'value' => 1, 'label' => $this->l('Enabled')),
+ array('id' => 'active_off', 'value' => 0, 'label' => $this->l('Disabled')),
+ )
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ 'name' => 'submitAddbusiness_source'
+ ),
+ 'buttons' => array(
+ 'save-and-stay' => array(
+ 'title' => $this->l('Save and stay'),
+ 'name' => 'submitAddbusiness_sourceAndStay',
+ 'type' => 'submit',
+ 'class' => 'btn btn-default pull-right',
+ 'icon' => 'process-icon-save',
+ ),
+ ),
+ );
+
+ return parent::renderForm();
+ }
+
+ protected function renderSourceForm()
+ {
+ $this->table = 'source';
+ $this->className = 'Source';
+ $this->identifier = 'id_source';
+ $this->object = null;
+
+ if (!($objSource = $this->loadObject(true))) {
+ return;
+ }
+
+ $businessSources = BusinessSource::getActiveList((int)$this->context->language->id);
+ $isUnremovableSource = $objSource->id && in_array($objSource->id, Source::getUnremovableIds());
+
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Booking Source'),
+ 'icon' => 'icon-edit'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'lang' => true,
+ 'required' => true,
+ 'hint' => $this->l('Invalid characters:').' <>;=#{}'
+ ),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Business Source'),
+ 'name' => 'id_business_source',
+ 'required' => true,
+ 'options' => array(
+ 'query' => $businessSources,
+ 'id' => 'id_business_source',
+ 'name' => 'name',
+ ),
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Source Code'),
+ 'name' => 'code',
+ 'required' => true,
+ 'class' => 'fixed-width-xl',
+ 'readonly' => (bool)$objSource->id,
+ 'hint' => $objSource->id
+ ? $this->l('The code cannot be changed after creation.')
+ : $this->l('A short unique machine code, e.g. "BOOKING_COM". Letters, numbers, underscores and hyphens only.')
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Enabled'),
+ 'name' => 'active',
+ 'required' => false,
+ 'class' => 't',
+ 'is_bool' => true,
+ 'default_value' => 1,
+ 'disabled' => $isUnremovableSource,
+ 'hint' => $isUnremovableSource ? $this->l('Built-in Booking Sources cannot be disabled.') : null,
+ 'values' => array(
+ array('id' => 'active_on', 'value' => 1, 'label' => $this->l('Enabled')),
+ array('id' => 'active_off', 'value' => 0, 'label' => $this->l('Disabled')),
+ )
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ 'name' => 'submitAddsource'
+ ),
+ 'buttons' => array(
+ 'save-and-stay' => array(
+ 'title' => $this->l('Save and stay'),
+ 'name' => 'submitAddsourceAndStay',
+ 'type' => 'submit',
+ 'class' => 'btn btn-default pull-right',
+ 'icon' => 'process-icon-save',
+ ),
+ ),
+ );
+
+ return parent::renderForm();
+ }
+
+
+ public function postProcess()
+ {
+ if (Tools::isSubmit('submitAddsource') || Tools::isSubmit('submitAddsourceAndStay')) {
+ return $this->postProcessSource();
+ } elseif (Tools::isSubmit('submitMergeSource')) {
+ return $this->postProcessMergeSource();
+ } elseif (Tools::isSubmit('deletesource')) {
+ return $this->postProcessDeleteSource();
+ } elseif (Tools::isSubmit('statussource')) {
+ return $this->postProcessStatusSource();
+ } elseif (Tools::isSubmit('submitBulkenableSelectionsource')) {
+ return $this->processUpdateStatusBulk(1);
+ } elseif (Tools::isSubmit('submitBulkdisableSelectionsource')) {
+ return $this->processUpdateStatusBulk(0);
+ } elseif (Tools::isSubmit('submitBulkdeletesource')) {
+ return $this->postProcessBulkDeleteSource();
+ } elseif (Tools::isSubmit('submitAddbusiness_source') || Tools::isSubmit('submitAddbusiness_sourceAndStay')) {
+ return $this->postProcessBusinessSource();
+ } elseif (Tools::isSubmit('status'.$this->table)) {
+ return $this->postProcessStatusBusinessSource();
+ } elseif (Tools::isSubmit('delete'.$this->table)) {
+ return $this->postProcessDeleteBusinessSource();
+ } elseif (Tools::isSubmit('submitBulkdelete'.$this->table)) {
+ return $this->postProcessBulkDeleteBusinessSource();
+ } else {
+ return parent::postProcess();
+ }
+ }
+
+ protected function postProcessDeleteSource()
+ {
+ $objSource = new Source((int)Tools::getValue('id_source'));
+ if (!$objSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Booking Source.');
+ } elseif (!$objSource->delete()) {
+ $this->errors[] = Tools::displayError('An error occurred while deleting the Booking Source.');
+ } else {
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$objSource->id_business_source.'&conf=1&token='.$this->token);
+ }
+ }
+
+ protected function postProcessStatusSource()
+ {
+ if (Validate::isLoadedObject($objSource = new Source((int)Tools::getValue('id_source')))) {
+ $idBusinessSource = $objSource->id_business_source;
+ $newActive = !$objSource->active;
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if ($newActive && (!Validate::isLoadedObject($objBusinessSource) || !$objBusinessSource->active)) {
+ $this->errors[] = $this->l('You cannot enable this Booking Source because its Business Source is disabled.');
+ } else {
+ $objSource->active = $newActive;
+ if ($objSource->save()) {
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=5&token='.$this->token;
+ }
+ }
+ }
+ }
+
+ protected function postProcessStatusBusinessSource()
+ {
+ if (Validate::isLoadedObject($objBusinessSource = new BusinessSource((int)Tools::getValue('id_business_source')))) {
+ $newActive = !$objBusinessSource->active;
+ if (!$newActive && $objBusinessSource->hasUnremovableSource()) {
+ $this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
+ } else {
+ $objBusinessSource->active = $newActive;
+ if ($objBusinessSource->save()) {
+ $this->redirect_after = self::$currentIndex.'&token='.$this->token.'&conf=5';
+ }
+ }
+ }
+ }
+
+ protected function postProcessBulkDeleteSource()
+ {
+ $idBusinessSource = 0;
+ foreach (Tools::getValue('sourceBox') as $selection) {
+ $objSource = new Source((int)$selection);
+ $idBusinessSource = $objSource->id_business_source;
+ if (!$objSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Booking Source.');
+ break;
+ }
+ }
+
+ if (!count($this->errors)) {
+ $this->className = 'Source';
+ $this->table = 'source';
+ $this->boxes = Tools::getValue('sourceBox');
+ parent::processBulkDelete();
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=1&token='.$this->token;
+ }
+ }
+
+ protected function postProcessDeleteBusinessSource()
+ {
+ $objBusinessSource = new BusinessSource((int)Tools::getValue('id_business_source'));
+ if (!$objBusinessSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Business Source.');
+ } else {
+ return parent::postProcess();
+ }
+ }
+
+ protected function postProcessBulkDeleteBusinessSource()
+ {
+ foreach (Tools::getValue($this->table.'Box') as $selection) {
+ $objBusinessSource = new BusinessSource((int)$selection);
+ if (!$objBusinessSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Business Source.');
+ break;
+ }
+ }
+
+ if (!count($this->errors)) {
+ return parent::postProcess();
+ }
+ }
+
+ protected function processUpdateStatusBulk($status = 1)
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $this->className = 'Source';
+ $this->table = 'source';
+ $this->boxes = Tools::getValue('sourceBox');
+ if(empty($this->boxes)){
+ $this->errors[] = $this->l('You must select at least one item to perform a bulk action.');
+ } elseif ($status) {
+ foreach ($this->boxes as $selection) {
+ $objSource = new Source((int)$selection);
+ $objBusinessSource = new BusinessSource($objSource->id_business_source);
+ if (!Validate::isLoadedObject($objBusinessSource) || !$objBusinessSource->active) {
+ $this->errors[] = $this->l('You cannot enable a Booking Source whose Business Source is disabled.');
+ break;
+ }
+ }
+ }
+ $this->display = 'view';
+ if(!$this->errors){
+ parent::processBulkStatusSelection($status);
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=5&token='.$this->token;
+ }
+ }
+
+ protected function postProcessSource()
+ {
+ $idSource = (int)Tools::getValue('id_source');
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $objSource = new Source($idSource);
+ $sourceCode = $idSource ? $objSource->code : trim(Tools::getValue('code'));
+ $isUnremovableSource = $idSource && in_array($idSource, Source::getUnremovableIds());
+
+ $defaultLangId = Configuration::get('PS_LANG_DEFAULT');
+ $objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
+ $languages = Language::getLanguages(false);
+ if (!trim(Tools::getValue('name_'.$defaultLangId))) {
+ $this->errors[] = $this->l('Name is required at least in ').
+ $objDefaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
+ if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
+ $this->errors[] = $this->l('Invalid name in ').$lang['name'];
+ }
+ }
+ }
+ }
+
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if (!Validate::isLoadedObject($objBusinessSource) || $objBusinessSource->deleted) {
+ $this->errors[] = $this->l('Please select a valid Business Source.');
+ } elseif (!$isUnremovableSource && (int)Tools::getValue('active') && !$objBusinessSource->active) {
+ $this->errors[] = $this->l('You cannot enable this Booking Source because its Business Source is disabled.');
+ }
+
+ if (!$idSource) {
+ if (!$sourceCode || !Validate::isModuleName($sourceCode)) {
+ $this->errors[] = $this->l('Source Code is invalid. Only letters, numbers, underscores and hyphens are allowed.');
+ } elseif (Source::codeExists($sourceCode, $idSource)) {
+ $this->errors[] = $this->l('This Source Code is already used by another Booking Source.');
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->display = $idSource ? 'edit' : 'add';
+ return false;
+ }
+
+ $objSource->id_business_source = $idBusinessSource;
+ $objSource->code = $sourceCode;
+ $objSource->active = $isUnremovableSource ? $objSource->active : (int)Tools::getValue('active');
+ $objSource->name = array();
+ foreach (Language::getIDs(false) as $idLang) {
+ $objSource->name[$idLang] = Tools::getValue('name_'.$idLang);
+ }
+
+ if (!$objSource->save()) {
+ $this->errors[] = Tools::displayError('An error occurred while saving the Booking Source.');
+ $this->display = $idSource ? 'edit' : 'add';
+ return false;
+ }
+
+ if (Tools::isSubmit('submitAddsourceAndStay')) {
+ Tools::redirectAdmin(self::$currentIndex.'&updatesource&id_source='.$objSource->id.'&conf='.($idSource ? 4 : 3).'&token='.$this->token);
+ }
+
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.$idBusinessSource.'&conf='.($idSource ? 4 : 3).'&token='.$this->token);
+ }
+
+ protected function postProcessMergeSource()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $idCurrentSource = (int)Tools::getValue('current_source');
+ $idTargetSource = (int)Tools::getValue('target_source');
+
+ $objCurrent = new Source($idCurrentSource);
+ $objTarget = new Source($idTargetSource);
+
+ if (!Validate::isLoadedObject($objCurrent) || !Validate::isLoadedObject($objTarget)
+ || (int)$objCurrent->id_business_source !== $idBusinessSource || (int)$objTarget->id_business_source !== $idBusinessSource
+ ) {
+ $this->errors[] = $this->l('Please select valid Current and Target Booking Sources.');
+ } elseif ($idCurrentSource === $idTargetSource) {
+ $this->errors[] = $this->l('Current and Target Booking Source cannot be the same.');
+ } else {
+ $objCurrent->mergeOrdersInto($idTargetSource);
+ }
+ $this->display = 'view';
+ if (!count($this->errors)) {
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.$idBusinessSource.'&conf=4&token='.$this->token);
+ }
+ }
+
+ protected function postProcessBusinessSource()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ if ($idBusinessSource) {
+ $sourceTypeCode = (new BusinessSource($idBusinessSource))->code;
+ $_POST['code'] = $sourceTypeCode;
+ } else {
+ $sourceTypeCode = trim(Tools::getValue('code'));
+ }
+
+ $defaultLangId = Configuration::get('PS_LANG_DEFAULT');
+ $objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
+ $languages = Language::getLanguages(false);
+ if (!trim(Tools::getValue('name_'.$defaultLangId))) {
+ $this->errors[] = $this->l('Name is required at least in ').
+ $objDefaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
+ if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
+ $this->errors[] = $this->l('Invalid name in ').$lang['name'];
+ }
+ }
+ }
+ }
+ if (!$idBusinessSource) {
+ if (!$sourceTypeCode || !Validate::isModuleName($sourceTypeCode)) {
+ $this->errors[] = $this->l('Code is invalid. Only letters, numbers, underscores and hyphens are allowed.');
+ } elseif (BusinessSource::codeExists($sourceTypeCode, $idBusinessSource)) {
+ $this->errors[] = $this->l('This Code is already used by another Business Source.');
+ }
+ }
+
+ if ($idBusinessSource && !(int)Tools::getValue('active')) {
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if ($objBusinessSource->hasUnremovableSource()) {
+ $this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->display = $idBusinessSource ? 'edit' : 'add';
+ return false;
+ }
+
+ return parent::postProcess();
+ }
+
+ public function formatOrdersPercentage($count, $row)
+ {
+ $percentage = $this->ordersTotal ? round(((int)$count / $this->ordersTotal) * 100, 1) : 0;
+ return $percentage.'%';
+ }
+
+ public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null, $ajax = false)
+ {
+ if ($this->table == 'source' && in_array((int)$id, Source::getUnremovableIds())) {
+ return '
+
+ ';
+ }
+
+ $helper = new HelperList();
+ $helper->token = $this->token;
+ $helper->currentIndex = self::$currentIndex;
+ $helper->table = $this->table;
+ $helper->identifier = $this->identifier;
+
+ return $helper->displayEnableLink($token, $id, $value, $active, $id_category, $id_product, $ajax);
+ }
+
+ public function displayMergeLink($token, $id, $name = null)
+ {
+ $idBusinessSource = (int) Tools::getValue('id_business_source');
+
+ return '
+ ' . $this->l('Merge') . '
+ ';
+ }
+
+ public function ajaxProcessInitMergeSourceModal()
+ {
+ $response = array('hasError' => 1);
+
+ if ($this->tabAccess['edit'] === 1) {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $idSource = (int)Tools::getValue('id_source');
+ $objSource = new Source($idSource,(int)$this->context->language->id);
+ if (Validate::isLoadedObject($objSource) && (int)$objSource->id_business_source === $idBusinessSource) {
+ $this->context->smarty->assign(array(
+ 'sources' => Source::getActiveSource($idBusinessSource, $idSource, (int)$this->context->language->id),
+ 'current_source' => $objSource,
+ 'id_business_source' => $idBusinessSource,
+ 'current_index' => self::$currentIndex,
+ 'token' => $this->token,
+ ));
+
+ $this->context->smarty->assign(array(
+ 'modal_id' => 'merge_source_modal',
+ 'modal_class' => 'modal-md',
+ 'modal_title' => ' ' .$this->l('Merge Booking Source'),
+ 'modal_content' => $this->context->smarty->fetch('controllers/sources/modals/_merge_source_form.tpl'),
+ ));
+
+ $response['hasError'] = 0;
+ $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl');
+ }
+ }
+
+ die(Tools::jsonEncode($response));
+ }
+
+ protected function filterToField($key, $filter)
+ {
+ if ($this->table == 'source') {
+ $this->initSourcesList();
+ } else {
+ $this->initBusinessSourcesList();
+ }
+
+ return parent::filterToField($key, $filter);
+ }
+
+ public function ajaxProcessUpdatePositions()
+ {
+ if ($this->tabAccess['edit'] !== 1) {
+ die(json_encode(array('hasError' => true, 'errors' => $this->l('You do not have permission to edit this.'))));
+ }
+
+ $way = (int)Tools::getValue('way');
+ $id = (int)Tools::getValue('id');
+
+ if ($positions = Tools::getValue('source')) {
+ $className = 'Source';
+ } elseif ($positions = Tools::getValue('source_type')) {
+ $className = 'BusinessSource';
+ } else {
+ die(json_encode(array('hasError' => true, 'errors' => 'Unknown table for position update.')));
+ }
+
+ foreach ($positions as $position => $value) {
+ $pos = explode('_', $value);
+
+ if (isset($pos[2]) && (int)$pos[2] === $id) {
+ if ($object = new $className((int)$pos[2])) {
+ if (isset($position) && $object->updatePosition($way, $position)) {
+ echo 'ok position '.(int)$position.' for '.$className.' '.$id;
+ } else {
+ echo '{"hasError" : true, "errors" : "Can not update tab '.(int)$id.' to position '.(int)$position.' "}';
+ }
+ } else {
+ echo json_encode(array(
+ 'hasError' => true,
+ 'errors' => 'Can not update '.$className.' '.$id.' to position '.(int)$position,
+ ));
+ }
+
+ break;
+ }
+ }
+ }
+}
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index d3933c954..78d01aca8 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -1909,7 +1909,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
return $result;
}
- // Calculate total services revenue (services and demands)
+ // Calculate total services revenue (services )
public static function getServicesRevenueForDiscreteDates($dateFrom, $dateTo = null, $idHotel = null, $useCache = true)
{
$dateTo = !$dateTo ? date('Y-m-d', strtotime('+1 day', strtotime($dateFrom))) : $dateTo;
@@ -1946,23 +1946,6 @@ class AdminStatsControllerCore extends AdminStatsTabController
$totalServicesRevenue += $servicesRevenue;
}
- // Calculate demands revenue
- $demandsRevenueSql = 'SELECT SUM((hdmd.`total_price_tax_excl` / o.`conversion_rate`) / DATEDIFF(hbd.`date_to`, hbd.`date_from`))
- FROM `'._DB_PREFIX_.'htl_booking_demands` hdmd
- LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd
- ON (hdmd.`id_htl_booking` = hbd.`id`)
- LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hbd.`id_product`)
- LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
- WHERE p.`active` = 1
- AND o.`valid` = 1
- AND hbd.`is_refunded` = 0
- AND hbd.`date_from` < "'.pSQL($discreteDate['date_to']).' 00:00:00" AND hbd.`date_to` > "'.pSQL($discreteDate['date_from']).' 00:00:00"'.
- (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '');
-
- if ($demandsRevenue = Db::getInstance()->getValue($demandsRevenueSql)) {
- $totalServicesRevenue += $demandsRevenue;
- }
-
$result[$discreteDate['timestamp_from']] = $totalServicesRevenue;
}
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index 894e7f257..6dd6566bf 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -96,6 +96,59 @@ class AdminTaxRulesGroupControllerCore extends AdminController
return parent::renderList();
}
+ /**
+ * Return taxes for the rule-form dropdown, filtered by whether this TRG is a tourism group.
+ *
+ * @return array
+ */
+ protected function getTaxOptionsForGroup()
+ {
+ $idTaxRulesGroup = (int) Tools::getValue('id_tax_rules_group');
+ $isTourism = false;
+ if ($idTaxRulesGroup) {
+ $taxRulesGroup = new TaxRulesGroup($idTaxRulesGroup);
+ if (Validate::isLoadedObject($taxRulesGroup)) {
+ $isTourism = (bool) $taxRulesGroup->is_tourism_tax_rule_group;
+ }
+ }
+
+ $idLang = (int) $this->context->language->id;
+ $sql = new DbQuery();
+ if ($isTourism) {
+ $sql->select(
+ 't.`id_tax`, tl.`name`,'
+ . ' IFNULL(tourism_tax.`calculation_type`, 0) AS tourism_tax_calc_type,'
+ . ' IFNULL(tourism_tax.`tax_value`, 0) AS tourism_tax_value'
+ );
+ } else {
+ $sql->select('t.`id_tax`, tl.`name`, t.`rate`');
+ }
+ $sql->from('tax', 't');
+ $sql->leftJoin('tax_lang', 'tl', 't.`id_tax` = tl.`id_tax` AND tl.`id_lang` = ' . $idLang);
+ if ($isTourism) {
+ $sql->leftJoin('tax_configuration', 'tourism_tax', 'tourism_tax.`id_tax` = t.`id_tax`');
+ }
+ $sql->where('t.`deleted` != 1 AND t.`active` = 1');
+ $sql->where('t.`is_tourism_tax` = ' . ($isTourism ? 1 : 0));
+ $sql->orderBy('tl.`name` ASC');
+
+ $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+
+ if ($isTourism && is_array($rows)) {
+ $currency = $this->context->currency;
+ $currencySign = Tools::safeOutput(trim($currency->prefix . $currency->suffix));
+ foreach ($rows as &$row) {
+ $typeLabel = ((int) $row['tourism_tax_calc_type'] === TaxConfiguration::CALCULATION_TYPE_PERCENTAGE)
+ ? (float) $row['tourism_tax_value'] . '%'
+ : $currencySign . ' ' . (float) $row['tourism_tax_value'];
+ $row['name'] = $row['name'] . ' (' . $typeLabel . ')';
+ }
+ unset($row);
+ }
+
+ return $rows;
+ }
+
public function initRulesList($id_group)
{
$this->table = 'tax_rule';
@@ -127,7 +180,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController
),
'rate' => array(
'title' => $this->l('Tax'),
- 'class' => 'fixed-width-sm'
+ 'class' => 'fixed-width-sm',
+ 'callback' => 'displayTaxRuleRate',
+ 'orderby' => false,
+ 'search' => false,
),
'description' => array(
'title' => $this->l('Description')
@@ -141,7 +197,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController
c.`name` AS country_name,
s.`name` AS state_name,
CONCAT_WS(" - ", a.`zipcode_from`, a.`zipcode_to`) AS zipcode,
- t.rate';
+ t.`rate`,
+ t.`is_tourism_tax`,
+ IFNULL(tourism_tax.`calculation_type`, 0) AS tourism_tax_calc_type,
+ IFNULL(tourism_tax.`tax_value`, 0) AS tourism_tax_value';
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'country_lang` c
@@ -149,7 +208,9 @@ class AdminTaxRulesGroupControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'state` s
ON (a.`id_state` = s.`id_state`)
LEFT JOIN `'._DB_PREFIX_.'tax` t
- ON (a.`id_tax` = t.`id_tax`)';
+ ON (a.`id_tax` = t.`id_tax`)
+ LEFT JOIN `'._DB_PREFIX_.'tax_configuration` tourism_tax
+ ON (tourism_tax.`id_tax` = t.`id_tax`)';
$this->_where = 'AND `id_tax_rules_group` = '.(int)$id_group;
$this->_use_found_rows = false;
@@ -194,7 +255,19 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
)
- )
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Tourism tax rule group'),
+ 'name' => 'is_tourism_tax_rule_group',
+ 'required' => false,
+ 'is_bool' => true,
+ 'hint' => $this->l('Mark this group as tourism-only. All tax rules added here must reference tourism taxes.'),
+ 'values' => array(
+ array('id' => 'is_tourism_tax_rule_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'is_tourism_tax_rule_off', 'value' => 0, 'label' => $this->l('No')),
+ )
+ ),
),
'submit' => array(
'title' => $this->l('Save and stay'),
@@ -309,7 +382,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->l('- This tax only: Will apply only this tax').'
+
+
+
+
+
+ ';
}
+ $mail_available_variables = $this->displayMailAvailableVariables($mail_files);
+
if (array_key_exists('txt', $mail_files)) {
$str_return .= '';
$str_return .= '';
@@ -2389,6 +2457,46 @@ class AdminTranslationsControllerCore extends AdminController
$str_return .= '
+
+
{/if}
+ {* Code For eco-tax working
+ *}
+ {include file="controllers/products/_tourism_tax_rule_field.tpl"}
+
{*
{/if}
+ {* Code For eco-tax working
+ *}
+ {include file="controllers/products/_tourism_tax_rule_field.tpl"}
diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
index 4f52451c7..afedb3edd 100644
--- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -72,6 +72,12 @@
+
+
+
+ {if $nationality}{$nationality}{else}--{/if}
+
diff --git a/admin/themes/default/template/controllers/normal_products/prices.tpl b/admin/themes/default/template/controllers/normal_products/prices.tpl
index bae5d1211..33ec72dfa 100644
--- a/admin/themes/default/template/controllers/normal_products/prices.tpl
+++ b/admin/themes/default/template/controllers/normal_products/prices.tpl
@@ -187,6 +187,7 @@ $(document).ready(function () {
auto_add_to_cart && $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}style="display:none"{/if}>
- {displayPrice price=($data.demand_price + $data.additional_service_price + $data.additional_services_auto_add_price)|escape:'html':'UTF-8'}
+ {displayPrice price=($data.additional_service_price + $data.additional_services_auto_add_price)|escape:'html':'UTF-8'}
{*
{displayPrice price=$data.amt_with_qty} *}
- {if (isset($data.extra_demands) && $data.extra_demands) || (isset($data.additional_service) && $data.additional_service) || (isset($data.selected_services) && $data.selected_services)}
- {displayPrice price=($data.amt_with_qty + $data.additional_services_auto_add_price + $data.demand_price + $data.additional_service_price)|escape:'html':'UTF-8'}
+ {if isset($data.additional_service) && $data.additional_service}
+ {displayPrice price=($data.amt_with_qty + $data.additional_services_auto_add_price + $data.additional_service_price)|escape:'html':'UTF-8'}
{else}
{displayPrice price=$data.amt_with_qty|escape:'html':'UTF-8'}
{/if}
@@ -153,7 +153,7 @@
{l s='Delete'}
- + {l s='Services'}
@@ -168,31 +168,22 @@
{* Modal for extra demands *}
-{*
diff --git a/admin/themes/default/template/controllers/order_preferences/helpers/options/options.tpl b/admin/themes/default/template/controllers/order_preferences/helpers/options/options.tpl
index 45eb6a349..b9fb5a7b2 100644
--- a/admin/themes/default/template/controllers/order_preferences/helpers/options/options.tpl
+++ b/admin/themes/default/template/controllers/order_preferences/helpers/options/options.tpl
@@ -100,6 +100,8 @@
});
}
{/if}
+
+ changeStandardProductAddressType();
});
{/if}
@@ -110,6 +112,5 @@
{/block}
diff --git a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl b/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl
deleted file mode 100644
index fad6ca46e..000000000
--- a/admin/themes/default/template/controllers/orders/_cart_booking_demands.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-{*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a 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
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*}
-
-
-
diff --git a/admin/themes/default/template/controllers/orders/_cart_booking_services.tpl b/admin/themes/default/template/controllers/orders/_cart_booking_services.tpl
new file mode 100644
index 000000000..f9b1f1d6c
--- /dev/null
+++ b/admin/themes/default/template/controllers/orders/_cart_booking_services.tpl
@@ -0,0 +1,45 @@
+{*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License version 3.0
+* that is bundled with this package in the file LICENSE.md
+* It is also available through the world-wide-web at this URL:
+* https://opensource.org/license/osl-3-0-php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to support@qloapps.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to a 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
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
+*}
+
+
-
-
-
-
-
-
- {l s='Room Services'}
-
-
-
-
- {if isset($selectedRoomDemands) && $selectedRoomDemands}
-
- {if isset($loaderImg) && $loaderImg}
-
-
- {/if}
-
- {include file='controllers/orders/modals/_add_order_extra_services_tab_content.tpl'}
-
- {if isset($selectedRoomDemands) && $selectedRoomDemands}
- {assign var=roomCount value=1}
- {foreach $selectedRoomDemands as $key => $roomDemand}
-
-
-
- {assign var=roomCount value=$roomCount+1}
- {/foreach}
- {/if}
-
- {if isset($roomTypeDemands) && $roomTypeDemands}
-
-
-
- {/if}
-
- | - | {l s='Name'} | -{l s='Options'} | -{l s='Unit Price (tax excl.)'} | -
|---|---|---|---|
| - - | -
- {$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_tax_excl'])}{convertPrice price = $demand['adv_option'][$selected_adv_option]['price_tax_excl']|escape:'html':'UTF-8'}{else if isset($demand['adv_option']) && $demand['adv_option']}{convertPrice price = $demand['adv_option'][$demand['adv_option']|@key]['price_tax_excl']}{else}{convertPrice price = $demand['price_tax_excl']|escape:'html':'UTF-8'}{/if} - - {if $demand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY} - {l s='/ night'} - {/if} - | -
- 
-
- {/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
index 699ccfb1c..441d0b84b 100644
--- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
+++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
@@ -137,13 +137,13 @@
+
+
+
+
+
+
+ {l s='Room Services'}
+
+
+
+
+ {include file='controllers/orders/modals/_add_order_extra_services_tab_content.tpl'}
+
+ {if isset($loaderImg) && $loaderImg}
+
+
+
+ {/if}
+ - + {l s='Services'}
+{*
*}
{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 *}
+{* Css for handling extra changes *}
+
+
+
+
+
diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index 5e3d15f6e..e18a07406 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -22,6 +22,11 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
+
+{/if}
+{/if}
diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl
deleted file mode 100644
index 2065616d4..000000000
--- a/admin/themes/default/template/controllers/products/additionalfacilities.tpl
+++ /dev/null
@@ -1,156 +0,0 @@
-{**
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a 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
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*}
-
- {if isset($product->id) && $product->id}
-
-
+
+
+
-
-{/if}
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index 37bd27107..7b0e8764f 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -121,7 +121,7 @@
+ data-room-type="{if isset($room_info['id_product'])}{$room_info['id_product']|intval}{/if}">
- {l s='Room Type Additional Facilities'}
-
-
- {l s='To create new additional facilities please visit'} {l s='Additional facilities'} {l s='page.'}
-
- {if isset($allDemands) && $allDemands}
-
-
-
-
- {/if}
-
@@ -465,6 +468,7 @@ $(document).ready(function () {
{l s='Specific prices'}
diff --git a/admin/themes/default/template/controllers/search/helpers/view/view.tpl b/admin/themes/default/template/controllers/search/helpers/view/view.tpl index 3e3483d15..a9619ae01 100644 --- a/admin/themes/default/template/controllers/search/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/search/helpers/view/view.tpl @@ -121,6 +121,19 @@ $(function() {
+
+ {/if}
+
{if isset($num_hotel_features) && $num_hotel_features}
+ {if $num_hotel_amenities == 1} + {l s='1 hotel amenity'} + {else} + {l s='%d hotel amenities' sprintf=$num_hotel_amenities} + {/if} +
+ {$hotel_amenities} +@@ -173,19 +186,6 @@ $(function() {
-
- {/if}
-
{if isset($num_refund_rules) && $num_refund_rules}
- {if $num_global_demands == 1} - {l s='1 global demand'} - {else} - {l s='%d global demands' sprintf=$num_global_demands} - {/if} -
- {$global_demands} -diff --git a/admin/themes/default/template/controllers/sources/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/sources/helpers/list/list_header.tpl new file mode 100644 index 000000000..41dd3b0a3 --- /dev/null +++ b/admin/themes/default/template/controllers/sources/helpers/list/list_header.tpl @@ -0,0 +1,18 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*} +{extends file="helpers/list/list_header.tpl"} +{block name="override_form_extra"} + {if isset($smarty.get.id_business_source)} + + {/if} +{/block} diff --git a/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl b/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl new file mode 100644 index 000000000..00a139193 --- /dev/null +++ b/admin/themes/default/template/controllers/sources/modals/_merge_source_form.tpl @@ -0,0 +1,33 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*} +
diff --git a/admin/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl b/admin/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl index da8358912..d8ce43931 100644 --- a/admin/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl +++ b/admin/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl @@ -54,14 +54,10 @@ - + + + +@@ -80,6 +76,10 @@ {l s='Cancel'} + {*$toggle_button*}
diff --git a/classes/BoOrder.php b/classes/BoOrder.php
index f08c766f6..adc4d423a 100644
--- a/classes/BoOrder.php
+++ b/classes/BoOrder.php
@@ -32,5 +32,6 @@ class BoOrder extends PaymentModule
$this->validateOrderAmount = false;
// Default payment type for backoffice order should be PAY_AT_HOTEL
$this->payment_type = OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL;
+ $this->idBookingSource = Source::getIdByCode('WALKIN');
}
}
\ No newline at end of file
diff --git a/classes/BusinessSource.php b/classes/BusinessSource.php
new file mode 100644
index 000000000..d9d072ed5
--- /dev/null
+++ b/classes/BusinessSource.php
@@ -0,0 +1,239 @@
+ 'business_source',
+ 'primary' => 'id_business_source',
+ 'multilang' => true,
+ 'fields' => array(
+ 'code' => array('type' => self::TYPE_STRING, 'validate' => 'isModuleName', 'required' => true, 'size' => 64),
+ 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'unremovable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ ),
+ );
+
+ public function add($autodate = true, $nullValues = false)
+ {
+ if ($this->position <= 0) {
+ $this->position = BusinessSource::getHigherPosition() + 1;
+ }
+
+ return parent::add($autodate, $nullValues);
+ }
+
+ public function update($nullValues = false)
+ {
+ if (!$this->active && $this->hasUnremovableSource()) {
+ return false;
+ }
+
+ $result = parent::update($nullValues);
+
+ if ($result && !$this->active) {
+ $this->disableSources();
+ }
+
+ return $result;
+ }
+
+ public function disableSources()
+ {
+ return (bool)Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'source` SET `active` = 0
+ WHERE `id_business_source` = '.(int)$this->id.' AND `deleted` = 0'
+ );
+ }
+
+ public static function getHigherPosition()
+ {
+ $position = Db::getInstance()->getValue(
+ 'SELECT MAX(`position`) FROM `'._DB_PREFIX_.'business_source` WHERE `deleted` = 0'
+ );
+
+ return is_numeric($position) ? (int)$position : -1;
+ }
+
+ public function updatePosition($way, $position)
+ {
+ if (!$res = Db::getInstance()->executeS('
+ SELECT `position`, `id_business_source`
+ FROM `'._DB_PREFIX_.'business_source`
+ WHERE `deleted` = 0
+ ORDER BY `position` ASC'
+ )) {
+ return false;
+ }
+
+ $moved_item = null;
+ foreach ($res as $row) {
+ if ((int)$row['id_business_source'] == (int)$this->id) {
+ $moved_item = $row;
+ }
+ }
+
+ if (!$moved_item) {
+ return false;
+ }
+
+ return (Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = `position` '.($way ? '- 1' : '+ 1').'
+ WHERE `deleted` = 0 AND `position`
+ '.($way
+ ? '> '.(int)$moved_item['position'].' AND `position` <= '.(int)$position
+ : '< '.(int)$moved_item['position'].' AND `position` >= '.(int)$position)
+ ) && Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = '.(int)$position.'
+ WHERE `id_business_source` = '.(int)$moved_item['id_business_source']));
+ }
+
+ public static function cleanPositions()
+ {
+ $return = true;
+
+ $result = Db::getInstance()->executeS('
+ SELECT `id_business_source`
+ FROM `'._DB_PREFIX_.'business_source`
+ WHERE `deleted` = 0
+ ORDER BY `position` ASC'
+ );
+
+ $i = 0;
+ foreach ($result as $row) {
+ $return = Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'business_source`
+ SET `position` = '.(int)$i++.'
+ WHERE `id_business_source` = '.(int)$row['id_business_source']
+ ) && $return;
+ }
+
+ return $return;
+ }
+
+ public static function codeExists($code, $idExclude = 0)
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT `id_business_source` FROM `'._DB_PREFIX_.'business_source`
+ WHERE `code` = \''.pSQL($code).'\' AND `id_business_source` != '.(int)$idExclude
+ );
+ }
+
+ public static function getUnremovableIds()
+ {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT `id_business_source` FROM `'._DB_PREFIX_.'business_source` WHERE `unremovable` = 1 AND `deleted` = 0'
+ );
+
+ return array_map('intval', array_column($rows, 'id_business_source'));
+ }
+
+ public static function getActiveList($idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT bs.`id_business_source`, bsl.`name`
+ FROM `'._DB_PREFIX_.'business_source` bs
+ LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl
+ ON (bsl.`id_business_source` = bs.`id_business_source` AND bsl.`id_lang` = '.(int)$idLang.')
+ WHERE bs.`deleted` = 0
+ ORDER BY bs.`position` ASC
+ ');
+ }
+
+ public function isRemovable()
+ {
+ return !$this->unremovable;
+ }
+
+ public function hasUnremovableSource()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$this->id.' AND `unremovable` = 1 AND `deleted` = 0'
+ );
+ }
+
+ public function hasSourceUsedByOrder()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source` s
+ INNER JOIN `'._DB_PREFIX_.'orders` o ON o.`id_source` = s.`id_source`
+ WHERE s.`id_business_source` = '.(int)$this->id
+ );
+ }
+
+ public function getOrderCount()
+ {
+ return (int)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source` s
+ INNER JOIN `'._DB_PREFIX_.'orders` o ON o.`id_source` = s.`id_source`
+ WHERE s.`id_business_source` = '.(int)$this->id
+ );
+ }
+
+ public function delete()
+ {
+ if (!$this->isRemovable()) {
+ return false;
+ }
+
+ $keepSoft = $this->hasSourceUsedByOrder();
+
+ $sources = Db::getInstance()->executeS(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source` WHERE `id_business_source` = '.(int)$this->id.' AND `deleted` = 0'
+ );
+ foreach ($sources as $row) {
+ $objSource = new Source((int)$row['id_source']);
+ if (!$objSource->delete()) {
+ return false;
+ }
+ }
+
+ if ($keepSoft) {
+ $this->deleted = 1;
+ if (!$this->update()) {
+ return false;
+ }
+ } elseif (!parent::delete()) {
+ return false;
+ }
+
+ return BusinessSource::cleanPositions();
+ }
+}
diff --git a/classes/Cart.php b/classes/Cart.php
index 96fe2c68c..6e7e282fd 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -186,7 +186,8 @@ class CartCore extends ObjectModel
const ONLY_ROOM_SERVICES_WITH_AUTO_ADD_WITHOUT_CONVENIENCE_FEE = 17;
const ONLY_CONVENIENCE_FEE = 18;
- const ONLY_PRODUCTS_WITH_DEMANDS = 19;
+ const ONLY_TOURISM_TAX = 19;
+ const ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE = 20;
public function __construct($id = null, $id_lang = null)
{
@@ -368,8 +369,8 @@ class CartCore extends ObjectModel
*/
public function getAverageProductsTaxRate(&$cart_amount_te = null, &$cart_amount_ti = null)
{
- $cart_amount_ti = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
- $cart_amount_te = $this->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount_ti = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
+ $cart_amount_te = $this->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
$cart_vat_amount = $cart_amount_ti - $cart_amount_te;
@@ -1548,7 +1549,7 @@ class CartCore extends ObjectModel
$compute_precision = $configuration->get('_PS_PRICE_COMPUTE_PRECISION_');
if (!$this->id) {
- return 0;
+ return $type == Cart::ONLY_TOURISM_TAX ? array('tourism_tax' => 0.0, 'tourism_tax_room' => 0.0, 'tourism_tax_service' => 0.0, 'tourism_tax_standalone_products' => 0.0, 'tourism_tax_convenience_fee' => 0.0) : 0;
}
$type = (int)$type;
@@ -1570,7 +1571,8 @@ class CartCore extends ObjectModel
Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING,
Cart::ADVANCE_PAYMENT,
Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS,
- Cart::ONLY_PRODUCTS_WITH_DEMANDS,
+ Cart::ONLY_TOURISM_TAX,
+ Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE,
);
// Define virtual context to prevent case where the cart is not the in the global context
@@ -1637,7 +1639,11 @@ class CartCore extends ObjectModel
}
$products_total = array();
$ecotax_total = 0;
- $totalDemandsPrice = 0;
+ $tourism_tax_total = 0.0;
+ $tourism_tax_room = 0.0;
+ $tourism_tax_service = 0.0;
+ $tourism_tax_standalone_products = 0.0;
+ $tourism_tax_convenience_fee = 0.0;
$objCartBookingData = new HotelCartBookingData();
$objServiceProductCartDetail = new ServiceProductCartDetail();
$objAdvPayment = new HotelAdvancedPayment();
@@ -1773,6 +1779,11 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $lineTotal;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $servicePorduct['tourism_tax'];
+ $tourism_tax_standalone_products += $servicePorduct['tourism_tax'];
+ }
}
}
@@ -1826,6 +1837,11 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $priceAdd;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $servicePorduct['tourism_tax'];
+ $tourism_tax_standalone_products += $servicePorduct['tourism_tax'];
+ }
}
}
} else if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']) {
@@ -1855,6 +1871,17 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += $servicePrice;
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ $tourism_tax_total += $service['tourism_tax'];
+ if ($product['auto_add_to_cart'] && Product::PRICE_ADDITION_TYPE_INDEPENDENT == $product['price_addition_type']) {
+ $tourism_tax_convenience_fee += $service['tourism_tax'];
+ } elseif ($product['auto_add_to_cart'] && Product::PRICE_ADDITION_TYPE_WITH_ROOM == $product['price_addition_type']) {
+ $tourism_tax_room += $service['tourism_tax'];
+ } else {
+ $tourism_tax_service += $service['tourism_tax'];
+ }
+ }
}
}
}
@@ -1864,8 +1891,6 @@ class CartCore extends ObjectModel
$priceDisplay = Group::getPriceDisplayMethod(Group::getCurrent()->id);
if ($type == Cart::ADVANCE_PAYMENT || $type == Cart::ADVANCE_PAYMENT_ONLY_PRODUCTS) {
- // getProductMinAdvPaymentAmountByIdCart already aggregates all rooms for this product internally,
- // so call it once and add once — not inside the per-room loop.
$advProductPrice = $objAdvPayment->getProductMinAdvPaymentAmountByIdCart(
$this->id,
$product['id_product'],
@@ -1911,18 +1936,49 @@ class CartCore extends ObjectModel
} else {
$products_total[$id_tax_rules_group] += Tools::processPriceRounding($totalPriceByProduct);
}
+
+ if ($with_taxes && in_array($type, array(Cart::BOTH, Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_TOURISM_TAX))) {
+ if ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $cartRoomInfo['id_product'])) {
+ $roomAddress = new Address((int) HotelRoomType::getHotelIdAddressByIdProduct($cartRoomInfo['id_product']));
+ $hotelBranch = new HotelBranchInformation((int) $roomAddress->id_hotel);
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($cartRoomInfo['date_from'], $cartRoomInfo['date_to']));
+ $unitPriceTe = (float) $roomTotalPrice['total_price_tax_excl'] / $numNights;
+ $childAges = !empty($occupancy[0]['child_ages']) ? (array) $occupancy[0]['child_ages'] : array();
+ $roomTaxCalculator = TaxManagerFactory::getManager($roomAddress, $idTourismTaxRulesGroup)->getTaxCalculator();
+ $roomTourismTax = $roomTaxCalculator->getTaxesTotalAmount(
+ $unitPriceTe,
+ $cartRoomInfo['date_from'],
+ $numNights,
+ $occupancy[0]['adults'],
+ $childAges,
+ (int) $hotelBranch->tourism_tax_collection_type,
+ 1,
+ (int) $this->id_currency
+ );
+ $tourism_tax_total += $roomTourismTax;
+ $tourism_tax_room += $roomTourismTax;
+ }
+ }
}
}
}
-
- // price of extra demands on room type in the cart
- $totalDemandsPrice += $objCartBookingData->getCartExtraDemands($this->id, $product['id_product'], 0, 0, 0, 1, 0, (int)$with_taxes);
}
+
+ if ($type == Cart::ONLY_TOURISM_TAX) {
+ return array(
+ 'tourism_tax' => $tourism_tax_total,
+ 'tourism_tax_room' => $tourism_tax_room,
+ 'tourism_tax_service' => $tourism_tax_service,
+ 'tourism_tax_standalone_products' => $tourism_tax_standalone_products,
+ 'tourism_tax_convenience_fee' => $tourism_tax_convenience_fee,
+ );
+ }
+
foreach ($products_total as $key => $price) {
$order_total += $price;
}
- $order_total_products = $order_total + $totalDemandsPrice;
+ $order_total_products = $order_total;
if ($type == Cart::ONLY_DISCOUNTS) {
$order_total = 0;
@@ -1941,15 +1997,6 @@ class CartCore extends ObjectModel
return $wrapping_fees;
}
- // price of extra demands on room type in the cart
- if ($type == Cart::BOTH
- || $type == Cart::BOTH_WITHOUT_SHIPPING
- || $type == Cart::ADVANCE_PAYMENT
- || $type == Cart::ONLY_PRODUCTS_WITH_DEMANDS
- ) {
- $order_total += $totalDemandsPrice;
- }
-
$order_total_discount = 0;
$order_shipping_discount = 0;
$advance_payment_products_discount = 0;
@@ -1964,7 +2011,7 @@ class CartCore extends ObjectModel
Cart::ONLY_ROOM_SERVICES_WITHOUT_AUTO_ADD,
Cart::ONLY_ROOM_SERVICES_WITHOUT_CONVENIENCE_FEE,
Cart::ONLY_ROOM_SERVICES_WITH_AUTO_ADD_WITHOUT_CONVENIENCE_FEE,
- Cart::ONLY_PRODUCTS_WITH_DEMANDS)
+ Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE)
) && CartRule::isFeatureActive()
) {
// First, retrieve the cart rules associated to this "getOrderTotal"
@@ -2052,6 +2099,10 @@ class CartCore extends ObjectModel
$order_total += $shipping_fees + $wrapping_fees;
}
+ if ($tourism_tax_total > 0) {
+ $order_total += $tourism_tax_total;
+ }
+
if ($order_total < 0 && $type != Cart::ONLY_DISCOUNTS) {
return 0;
}
@@ -3163,8 +3214,17 @@ class CartCore extends ObjectModel
}
}
} elseif ($sellingPreferenceType == Product::SELLING_PREFERENCE_STANDALONE) {
- if (isset($id_customer)) {
- $id_address = (int)Address::getFirstCustomerAddressId($id_customer);
+ $addressPreferenceType = Configuration::get('PS_STANDARD_PRODUCT_ORDER_ADDRESS_PREFRENCE');
+ if ($addressPreferenceType == Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_CUSTOM) {
+ $id_address = (int) Configuration::get('PS_STANDARD_PRODUCT_ORDER_ADDRESS_ID');
+ } elseif ($addressPreferenceType != Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_HOTEL) {
+ $customer = Context::getContext()->customer;
+ if (Validate::isLoadedObject($customer) && ($idCustomerAddress = Address::getFirstCustomerAddressId($customer->id))) {
+ $id_address = $idCustomerAddress;
+ }
+ }
+ if (!$id_address && ($htlAddress = HotelBranchInformation::getAddress(Configuration::get('WK_PRIMARY_HOTEL')))) {
+ $id_address = $htlAddress['id_address'];
}
}
}
@@ -3827,26 +3887,6 @@ class CartCore extends ObjectModel
$total_discounts = $this->getOrderTotal(true, Cart::ONLY_DISCOUNTS);
$total_discounts_tax_exc = $this->getOrderTotal(false, Cart::ONLY_DISCOUNTS);
$objCartBookingData = new HotelCartBookingData();
- $total_demands_wt = $objCartBookingData->getCartExtraDemands(
- $this->id,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1
- );
- $total_demands = $objCartBookingData->getCartExtraDemands(
- $this->id,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 0
- );
// The cart content is altered for display
foreach ($cart_rules as &$cart_rule) {
// If the cart rule is automatic (wihtout any code) and include free shipping, it should not be displayed as a cart rule but only set the shipping cost to 0
@@ -3932,9 +3972,41 @@ class CartCore extends ObjectModel
}
}
+ $totalRoomsCount = 0;
+ if ($htlCartData = HotelCartBookingData::getHotelCartBookingData(0)) {
+ foreach ($htlCartData as $roomTypeCart) {
+ $totalRoomsCount += $roomTypeCart['total_num_rooms'];
+ }
+ }
+ $nbTotalProducts = 0;
+ $objServiceProductCartDetail = new ServiceProductCartDetail();
+ foreach ($products as &$product) {
+ if (!$product['booking_product']) {
+ if (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
+ $nbTotalProducts += (int) $product['cart_quantity'];
+ } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+ || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+ ) {
+ if ($serviceProducts = $objServiceProductCartDetail->getServiceProductsInCart(
+ $this->id,
+ [Product::SELLING_PREFERENCE_HOTEL_STANDALONE, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE],
+ null,
+ 0,
+ null,
+ $product['id_product']
+ )) {
+ foreach ($serviceProducts as $serviceProduct) {
+ if ($serviceProduct['id_hotel'] && $serviceProduct['id_product'] == $product['id_product']) {
+ $nbTotalProducts += (int) $serviceProduct['quantity'];
+ }
+ }
+ }
+ }
+ }
+ }
$objHotelAdvancedPayment = new HotelAdvancedPayment();
- $total_rooms_with_services_without_discount_te = $total_rooms + $total_demands + $total_additional_services + $total_additional_services_auto_add + $total_standalone_service_products;
- $total_rooms_with_services_without_discount_ti = $total_rooms_wt + $total_demands_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt + $total_standalone_service_products_wt;
+ $total_rooms_with_services_without_discount_te = $total_rooms + $total_additional_services + $total_additional_services_auto_add + $total_standalone_service_products;
+ $total_rooms_with_services_without_discount_ti = $total_rooms_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt + $total_standalone_service_products_wt;
$cart_total_without_discount_te = $total_rooms_with_services_without_discount_te + $convenience_fee;
$cart_total_without_discount_ti = $total_rooms_with_services_without_discount_ti + $convenience_fee_wt;
@@ -3943,6 +4015,23 @@ class CartCore extends ObjectModel
$total_tax_without_discount = 0;
}
+ $tourismTaxTotals = $this->getOrderTotal(true, Cart::ONLY_TOURISM_TAX);
+ $tourism_tax = $tourismTaxTotals['tourism_tax'];
+ $tourism_tax_convenience_fee = $tourismTaxTotals['tourism_tax_convenience_fee'];
+ $tourism_tax_service = $tourismTaxTotals['tourism_tax_service'];
+ $tourism_tax_room = $tourismTaxTotals['tourism_tax_room'];
+ $tourism_tax_standalone_products = $tourismTaxTotals['tourism_tax_standalone_products'];
+
+ $roomGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_room) ? $tourism_tax_room : 0.0;
+ $serviceGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_service) ? $tourism_tax_service : 0.0;
+ $standaloneProductsGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_standalone_products) ? $tourism_tax_standalone_products : 0.0;
+ $convenienceFeeGrossUpAmount = TaxConfiguration::isGrossedUp($tourism_tax_convenience_fee) ? $tourism_tax_convenience_fee : 0.0;
+ $total_rooms_wt += $roomGrossUpAmount;
+ $total_additional_services_wt += $serviceGrossUpAmount;
+ $total_standalone_service_products_wt += $standaloneProductsGrossUpAmount;
+ $convenience_fee_wt += $convenienceFeeGrossUpAmount;
+ $total_rooms_with_services_without_discount_ti += $roomGrossUpAmount + $serviceGrossUpAmount + $standaloneProductsGrossUpAmount + $convenienceFeeGrossUpAmount;
+
$summary = array(
'delivery' => $delivery,
'delivery_state' => State::getNameById($delivery->id_state),
@@ -3972,8 +4061,6 @@ class CartCore extends ObjectModel
'convenience_fee_tax' => $convenience_fee_tax,
'total_standalone_service_products_wt' => $total_standalone_service_products_wt,
'total_standalone_service_products' => $total_standalone_service_products,
- 'total_extra_demands_wt' => $total_demands_wt,
- 'total_extra_demands' => $total_demands,
'total_price' => $base_total_tax_inc,
'total_tax' => $total_tax,
'total_price_without_tax' => $base_total_tax_exc,
@@ -3988,7 +4075,11 @@ class CartCore extends ObjectModel
'total_rooms_with_services_without_discount_ti' => $total_rooms_with_services_without_discount_ti,
'cart_total_without_discount_te' => $cart_total_without_discount_te,
'cart_total_without_discount_ti' => $cart_total_without_discount_ti,
- 'total_tax_without_discount' => $total_tax_without_discount
+ 'total_tax_without_discount' => $total_tax_without_discount,
+ 'tourism_tax' => max(0.0, (float) $tourism_tax),
+ 'total_tourism_tax' => max(0.0, (float) $tourism_tax),
+ 'tourism_tax_grossed_up' => TaxConfiguration::isGrossedUp($tourism_tax),
+ 'total_products_in_cart' => $totalRoomsCount + $nbTotalProducts,
);
$hook = Hook::exec('actionCartSummary', $summary, null, true);
if (is_array($hook)) {
@@ -4907,20 +4998,11 @@ class CartCore extends ObjectModel
$idCustomer = $objCart->id_customer;
$idCurrency = $objCart->id_currency;
- $extraDemands = null;
-
// We have to check the alreadt entered rooms for booking parameters with this variable as Also is sending all the rooms everytime
// because id_guest is not managed in the API call
$roomsAddedToCart = [];
foreach ($bookingRows as $booking) {
$booking = json_decode(json_encode($booking, true), true);
- if (isset($booking['extra_demands']['extra_demand'])) {
- $extraDemands = $booking['extra_demands']['extra_demand'];
- if (isset($extraDemands['id_global_demand'])) {
- $extraDemands = array($extraDemands);
- }
- $extraDemands = json_encode($extraDemands);
- }
// get room booking info
$idProduct = $booking['id_product'];
@@ -5027,7 +5109,6 @@ class CartCore extends ObjectModel
$objCartBooking->id_hotel = $val_hotel_room_info['id_hotel'];
$objCartBooking->booking_type = HotelBookingDetail::ALLOTMENT_AUTO;
$objCartBooking->quantity = $numDays;
- $objCartBooking->extra_demands = $extraDemands;
$objCartBooking->date_from = $dateFrom;
$objCartBooking->date_to = $dateTo;
$objCartBooking->save();
diff --git a/classes/CartRule.php b/classes/CartRule.php
index b2ca7172a..6f25aeabf 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -1018,8 +1018,8 @@ class CartRuleCore extends ObjectModel
$all_cart_rules_ids = $context->cart->getOrderedCartRulesIds();
- $cart_amount_ti = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
- $cart_amount_te = $context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount_ti = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
+ $cart_amount_te = $context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
// Free shipping on selected carriers
if ($this->free_shipping && in_array($filter, array(CartRule::FILTER_ACTION_ALL, CartRule::FILTER_ACTION_ALL_NOCAP, CartRule::FILTER_ACTION_SHIPPING))) {
@@ -1045,7 +1045,7 @@ class CartRuleCore extends ObjectModel
// Discount (%) on the whole order
if ($this->reduction_percent && $this->reduction_product == 0) {
// Do not give a reduction on free products!
- $order_total = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS, $package_products);
+ $order_total = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, $package_products);
foreach ($context->cart->getCartRules(CartRule::FILTER_ACTION_GIFT) as $cart_rule) {
$order_total -= Tools::ps_round($cart_rule['obj']->getContextualValue($use_tax, $context, CartRule::FILTER_ACTION_GIFT, $package), _PS_PRICE_COMPUTE_PRECISION_);
}
@@ -1118,9 +1118,9 @@ class CartRuleCore extends ObjectModel
if ((float)$this->reduction_amount > 0) {
$prorata = 1;
if (!is_null($package) && count($all_products)) {
- $total_products = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $total_products = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
if ($total_products) {
- $prorata = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS, $package['products']) / $total_products;
+ $prorata = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, $package['products']) / $total_products;
}
}
@@ -1169,7 +1169,7 @@ class CartRuleCore extends ObjectModel
if ($this->reduction_tax == $use_tax) {
// The reduction cannot exceed the products total, except when we do not want it to be limited (for the partial use calculation)
if ($filter != CartRule::FILTER_ACTION_ALL_NOCAP) {
- $cart_amount = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_DEMANDS);
+ $cart_amount = $context->cart->getOrderTotal($use_tax, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE);
$reduction_amount = min($reduction_amount, $cart_amount);
}
$reduction_value += $prorata * $reduction_amount;
@@ -1467,7 +1467,7 @@ class CartRuleCore extends ObjectModel
return array();
}
- $order_total = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_DEMANDS, null, null, false);
+ $order_total = $context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITH_ADDITIONAL_SERVICE, null, null, false);
static $errors = array();
foreach ($context->cart->getCartRules() as $cart_rule) {
if ($error = $cart_rule['obj']->checkValidity($context, true)) {
diff --git a/classes/Customer.php b/classes/Customer.php
index d5644633b..752fd9605 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -41,6 +41,9 @@ class CustomerCore extends ObjectModel
/** @var int Gender ID */
public $id_gender = 0;
+ /** @var int Nationality, stored as a country ID */
+ public $id_country = 0;
+
/** @var int Default group ID */
public $id_default_group;
@@ -170,6 +173,7 @@ class CustomerCore extends ObjectModel
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'required' => true, 'size' => 60),
'last_passwd_gen' => array('type' => self::TYPE_STRING, 'copy_post' => false),
'id_gender' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_country' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'birthday' => array('type' => self::TYPE_DATE, 'validate' => 'isBirthDate'),
'newsletter' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'newsletter_date_add' => array('type' => self::TYPE_DATE,'copy_post' => false),
@@ -209,6 +213,10 @@ class CustomerCore extends ObjectModel
if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) {
self::$definition['fields']['phone']['required'] = true;
}
+
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY')) {
+ self::$definition['fields']['id_country']['required'] = true;
+ }
}
public function validateFields($die = true, $error_return = false)
@@ -830,6 +838,16 @@ class CustomerCore extends ObjectModel
return (int) Configuration::get('PS_COUNTRY_DEFAULT');
}
+ public static function getNationalities($id_lang)
+ {
+ $nationalities = Country::getCountries((int) $id_lang);
+ $nationalities[-1] = array(
+ 'id_country' => -1,
+ 'name' => Translate::getAdminTranslation('Other', 'AdminCustomers'),
+ );
+
+ return $nationalities;
+ }
public function toggleStatus()
{
diff --git a/classes/Language.php b/classes/Language.php
index af5923fca..e4a61b0a4 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -26,6 +26,9 @@
class LanguageCore extends ObjectModel
{
+ const EMAIL_TEMPLATE_TYPE_CORE = 1;
+ const EMAIL_TEMPLATE_TYPE_MODULE = 2;
+
public $id;
/** @var string Name */
@@ -1065,4 +1068,69 @@ class LanguageCore extends ObjectModel
}
}
}
-}
+
+ public static function resetEmailTemplate($mail_template_name, $iso, $template_type, $module_name = false, $theme = '')
+ {
+ $is_module_template = ($template_type === self::EMAIL_TEMPLATE_TYPE_MODULE);
+
+ if ($theme) {
+ $dest_dir = $is_module_template
+ ? _PS_ROOT_DIR_.'/themes/'.$theme.'/modules/'.$module_name.'/mails/'.$iso.'/'
+ : _PS_ROOT_DIR_.'/themes/'.$theme.'/mails/'.$iso.'/';
+ } else {
+ $dest_dir = $is_module_template
+ ? rtrim(_PS_MODULE_DIR_, '/').'/'.$module_name.'/mails/'.$iso.'/'
+ : _PS_MAIL_DIR_.$iso.'/';
+ }
+
+ // Reuse the already-downloaded language pack if we have one, only hit the API when it's missing
+ $gzip_file = _PS_TRANSLATIONS_DIR_.$iso.'.gzip';
+ if (!file_exists($gzip_file)) {
+ Language::downloadAndInstallLanguagePack($iso, null, null, false);
+ }
+ if (!file_exists($gzip_file)) {
+ return array('hasError' => true, 'error' => Tools::displayError('Could not download the language pack from the QloApps API. Please check your internet connection and try again.'));
+ }
+
+ require_once(_PS_TOOL_DIR_.'tar/Tar.php');
+ $gz = new Archive_Tar($gzip_file, true);
+ if ($gz->error_object) {
+ return array('hasError' => true, 'error' => Tools::displayError('The downloaded language pack is corrupted. Please try again.'));
+ }
+ $archive_dir = $is_module_template
+ ? 'modules/'.$module_name.'/mails/'.$iso.'/'
+ : 'mails/'.$iso.'/';
+
+ $mail_dir = $is_module_template
+ ? rtrim(_PS_MODULE_DIR_, '/').'/'.$module_name.'/mails/'
+ : _PS_MAIL_DIR_;
+
+ $content = array('html' => null, 'txt' => null);
+ foreach (array_keys($content) as $ext) {
+ $file_content = $gz->extractInString($archive_dir.$mail_template_name.'.'.$ext);
+ if ($file_content === null) {
+ if (file_exists($mail_dir.$iso.'/'.$mail_template_name.'.'.$ext)) {
+ $file_content = file_get_contents($mail_dir.$iso.'/'.$mail_template_name.'.'.$ext);
+ } elseif (file_exists($mail_dir.'en/'.$mail_template_name.'.'.$ext)) {
+ $file_content = file_get_contents($mail_dir.'en/'.$mail_template_name.'.'.$ext);
+ }
+ }
+ if ($file_content !== null) {
+ if (file_put_contents($dest_dir.$mail_template_name.'.'.$ext, $file_content) === false) {
+ return array('hasError' => true, 'error' => sprintf(Tools::displayError('Could not write file "%s".'), $dest_dir.$mail_template_name.'.'.$ext));
+ }
+ $content[$ext] = $file_content;
+ }
+ }
+
+ if ($content['html'] === null && $content['txt'] === null) {
+ return array('hasError' => true, 'error' => Tools::displayError('This template was not found in the downloaded language pack.'));
+ }
+
+ return array(
+ 'hasError' => false,
+ 'html' => $content['html'],
+ 'txt' => $content['txt'],
+ );
+ }
+}
\ No newline at end of file
diff --git a/classes/Media.php b/classes/Media.php
index 58feb76d8..ab9ea2574 100644
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -45,9 +45,9 @@ class MediaCore
'ui.tabs' => array('fileName' => 'jquery.ui.tabs.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
'ui.datepicker' => array('fileName' => 'jquery.ui.datepicker.min.js', 'dependencies' => array('ui.core'), 'theme' => true),
'ui.progressbar' => array('fileName' => 'jquery.ui.progressbar.min.js', 'dependencies' => array('ui.core', 'ui.widget'), 'theme' => true),
- 'ui.tooltip' => array('fileName' => 'jquery.ui.tooltip.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.position','effects.core'), 'theme' => true),
- 'ui.accordion' => array('fileName' => 'jquery.ui.accordion.min.js', 'dependencies' => array('ui.core', 'ui.widget','effects.core'), 'theme' => true),
- 'effects.core' => array('fileName' => 'jquery.effects.core.min.js', 'dependencies' => array(), 'theme' => false),
+ 'ui.tooltip' => array('fileName' => 'jquery.ui.tooltip.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.position','ui.effect'), 'theme' => true),
+ 'ui.accordion' => array('fileName' => 'jquery.ui.accordion.min.js', 'dependencies' => array('ui.core', 'ui.widget','ui.effect'), 'theme' => true),
+ 'ui.effect' => array('fileName' => 'jquery.ui.effect.min.js', 'dependencies' => array(), 'theme' => false),
'effects.blind' => array('fileName' => 'jquery.effects.blind.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
'effects.bounce' => array('fileName' => 'jquery.effects.bounce.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
'effects.clip' => array('fileName' => 'jquery.effects.clip.min.js', 'dependencies' => array('effects.core'), 'theme' => false),
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 1f7df631f..bd9da789c 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -357,6 +357,13 @@ abstract class PaymentModuleCore extends Module
$order->source = Configuration::get('PS_SHOP_DOMAIN');
}
+ // Booking Source (business categorization, e.g. Direct Website/Walk-in/OTA) —
+ if (isset($this->idBookingSource) && $this->idBookingSource) {
+ $order->id_source = (int)$this->idBookingSource;
+ } else {
+ $order->id_source = (int)Source::getDefaultSourceId();
+ }
+
if (self::DEBUG_MODE) {
PrestaShopLogger::addLog('PaymentModule::validateOrder - Order is about to be added', 1, null, 'Cart', (int)$id_cart, true);
}
@@ -510,6 +517,7 @@ abstract class PaymentModuleCore extends Module
$objMail = new Mail();
$objServiceProductCartDetail = new ServiceProductCartDetail();
$cart_rules = $this->context->cart->getCartRules();
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
foreach ($order_detail_list as $key => $order_detail) {
/** @var OrderDetail $order_detail */
@@ -913,64 +921,37 @@ abstract class PaymentModuleCore extends Module
);
}
}
- if ($objBookingDetail->save()) {
- // save extra demands info
- if ($objCartBookingData->extra_demands
- && ($extraDemands = json_decode($objCartBookingData->extra_demands, true))
- ) {
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($extraDemands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $objBookingDetail->id;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
- $objBookingDemand->unit_price_tax_excl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 0
- );
- $objBookingDemand->unit_price_tax_incl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 1
- );
+ if (!$objBookingDetail->save()) {
+ PrestaShopLogger::addLog('PaymentModule::validateOrder - Cannot save Booking Detail', 3, null, 'Cart', (int)$id_cart, true);
+ throw new PrestaShopException('Can\'t save Booking Detail');
+ }
- $numDays = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- }
+ OrderTaxDetail::updateVatScoping((int) $id_order_detail, (int) $objBookingDetail->id, 0);
- $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $numDays;
- $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $numDays;
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $hotelTaxContext = TaxConfiguration::resolveHotelAddressAndCollectionType($objCartBookingData->id_hotel, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ $numNights = max(1, HotelHelper::getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to));
+ $numAdults = (int) $objCartBookingData->adults;
+ $childAges = !empty($objCartBookingData->child_ages) ? (array) json_decode($objCartBookingData->child_ages, true) : array();
+ $unitPriceTaxExcl = (float) $total_price['total_price_tax_excl'] / $numNights;
- $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
- );
- $taxCalc = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalc->computation_method;
- if ($objBookingDemand->save()) {
- $objBookingDemand->tax_calculator = $taxCalc;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
- }
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $hotelTaxContext['address'],
+ $unitPriceTaxExcl,
+ $objBookingDetail->date_from,
+ $numNights,
+ $numAdults,
+ $childAges,
+ (int) $this->context->cart->id_currency,
+ $hotelTaxContext['collectionType'],
+ (int) $idLang,
+ 1,
+ $order->id,
+ (int) $id_order_detail,
+ $objBookingDetail->id,
+ 0
+ );
}
}
} else {
@@ -1013,7 +994,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->name = $product['name'];
$objServiceProductOrderDetail->quantity = $roomTypeService['quantity'];
$objServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($roomBookingDetail['id_hotel'], $roomBookingDetail['id'], new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
} elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']) {
@@ -1046,7 +1050,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->hotel_name = $objHotelBranch->hotel_name;
}
$objServiceProductOrderDetail->quantity = $hotelProduct['quantity'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($product['id_hotel'], 0, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
@@ -1074,7 +1101,30 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->name = $standaloneProduct['name'];
$objServiceProductOrderDetail->option_name = $standaloneProduct['option_name'];
$objServiceProductOrderDetail->quantity = $standaloneProduct['quantity'];
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(0, 0, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
@@ -1131,7 +1181,32 @@ abstract class PaymentModuleCore extends Module
$objServiceProductOrderDetail->id_htl_booking_detail = $roomBookingDetail['id'];
$objServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
}
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ $idHotel = $serviceProduct['id_hotel'] ? $serviceProduct['id_hotel'] : (isset($roomBookingDetail['id_hotel']) ? (int) $roomBookingDetail['id_hotel'] : 0);
+ $idHtlBookingDetail = $serviceProduct['id_hotel'] ? 0 : (isset($roomBookingDetail['id']) ? (int) $roomBookingDetail['id'] : 0);
+ if ($useTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext($idHotel, $idHtlBookingDetail, new Address((int) Cart::getIdAddressForTaxCalculation($idProduct)));
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $idLang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
}
}
@@ -1237,8 +1312,8 @@ abstract class PaymentModuleCore extends Module
$cart_booking_data_text = $this->getEmailTemplateContent('hotel_booking_cart_data_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
$cart_booking_data_html = $this->getEmailTemplateContent('hotel_booking_cart_data.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
- $extra_demands_details_html = $this->getEmailTemplateContent('booking_extra_demands.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
- $extra_demands_details_text = $this->getEmailTemplateContent('booking_extra_demands_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
+ $extra_services_details_html = $this->getEmailTemplateContent('booking_extra_services.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']);
+ $extra_services_details_text = $this->getEmailTemplateContent('booking_extra_services_text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']);
$normal_products_data_html = $this->getEmailTemplateContent('service_product_data.tpl', Mail::TYPE_HTML, $orderServiceProducts);
$normal_products_data_txt = $this->getEmailTemplateContent('service_product_data_text.tpl', Mail::TYPE_TEXT, $orderServiceProducts);
@@ -1250,8 +1325,8 @@ abstract class PaymentModuleCore extends Module
$room_tax = ($room_price_tax_incl - $room_price_tax_excl);
// extra services
- $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_te']);
- $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
+ $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0));
+ $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0));
$additional_service_tax = ($additional_service_price_tax_incl - $additional_service_price_tax_excl);
// convenience fee price
@@ -1267,7 +1342,8 @@ abstract class PaymentModuleCore extends Module
$service_products_tax = ($standalone_products_price_tax_incl + $hotel_standalone_products_price_tax_incl) - ($standalone_products_price_tax_excl + $hotel_standalone_products_price_tax_excl);
- $total_order_tax = $room_tax + $additional_service_tax + $total_convenience_fee_tax + $service_products_tax;
+ $totalTourismTax = OrderTaxDetail::getOrderTourismTaxTotal((int) $order->id);
+ $total_order_tax = max(0, $room_tax + $additional_service_tax + $total_convenience_fee_tax + $service_products_tax - $totalTourismTax);
$total_products = Tools::displayPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? $order->total_products : $order->total_products_wt, $this->context->currency, false);
@@ -1293,6 +1369,8 @@ abstract class PaymentModuleCore extends Module
),
'service_products_tax' => Tools::displayPrice($service_products_tax, $this->context->currency, false),
'total_order_tax' => Tools::displayPrice($total_order_tax, $this->context->currency, false),
+ 'total_tourism_tax' => Tools::displayPrice($totalTourismTax, $this->context->currency, false),
+ 'has_tourism_tax' => $totalTourismTax > 0,
'total_paid' => Tools::displayPrice($order->total_paid, $this->context->currency, false),
'total_products' => Tools::displayPrice($total_products, $this->context->currency, false),
'total_discounts' => Tools::displayPrice(-$order->total_discounts, $this->context->currency, false),
@@ -1311,22 +1389,12 @@ abstract class PaymentModuleCore extends Module
$data = array(
'{cart_booking_data_html}' => $cart_booking_data_html,
'{cart_booking_data_text}' => $cart_booking_data_text,
- '{extra_demands_details_html}' => $extra_demands_details_html,
- '{extra_demands_details_text}' => $extra_demands_details_text,
+ '{extra_services_details_html}' => $extra_services_details_html,
+ '{extra_services_details_text}' => $extra_services_details_text,
'{normal_products_data_html}' => $normal_products_data_html,
'{normal_products_data_txt}' => $normal_products_data_txt,
'{order_total_info_html}' => $order_total_info_html,
'{order_total_info_txt}' => $order_total_info_txt,
- '{total_extra_demands_te}' => Tools::displayPrice(
- $cart_booking_data['total_extra_demands_te'],
- $this->context->currency,
- false
- ),
- '{extra_demands_tax}' => Tools::displayPrice(
- ($cart_booking_data['total_extra_demands_ti']-$cart_booking_data['total_extra_demands_te']),
- $this->context->currency,
- false
- ),
'{delivery_company}' => $delivery->company,
'{delivery_firstname}' => $delivery->firstname,
'{delivery_lastname}' => $delivery->lastname,
@@ -1895,10 +1963,7 @@ abstract class PaymentModuleCore extends Module
$obj_cart_bk_data = new HotelCartBookingData();
$obj_htl_bk_dtl = new HotelBookingDetail();
$obj_rm_type = new HotelRoomType();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
- $result['total_extra_demands_te'] = 0;
- $result['total_extra_demands_ti'] = 0;
$cart_htl_data = array();
if (!empty($products)) {
foreach ($products as $type_key => $type_value) {
@@ -1972,35 +2037,6 @@ abstract class PaymentModuleCore extends Module
$cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children'];
- // extra demands prices
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1
- );
-
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order->id,
0,
@@ -2046,9 +2082,6 @@ abstract class PaymentModuleCore extends Module
$cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = ($cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = ($data_v['total_price_tax_incl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = ($data_v['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']);
-
- $result['total_extra_demands_te'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'];
- $result['total_extra_demands_ti'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'];
}
}
// calculate averages now
diff --git a/classes/Product.php b/classes/Product.php
index 101829007..f09b83c20 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -226,6 +226,9 @@ class ProductCore extends ObjectModel
public $id_tax_rules_group = 1;
+ /** @var int Tourism tax rules group id (0 = no tourism tax) */
+ public $id_tourism_tax_rules_group = 0;
+
/**
* We keep this variable for retrocompatibility for themes
* @deprecated 1.5.0
@@ -313,8 +316,9 @@ class ProductCore extends ObjectModel
/* Shop fields */
'id_category_default' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
- 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
- 'on_sale' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
+ 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
+ 'id_tourism_tax_rules_group' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
+ 'on_sale' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
'online_only' => array('type' => self::TYPE_BOOL, 'shop' => true, 'validate' => 'isBool'),
'ecotax' => array('type' => self::TYPE_FLOAT, 'shop' => true, 'validate' => 'isPrice'),
'minimal_quantity' => array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedInt'),
@@ -469,14 +473,6 @@ class ProductCore extends ObjectModel
'id' => array('required' => true),
)
),
- 'extra_demands' => array(
- 'resource' => 'extra_demand',
- 'fields' => array(
- 'id' => array('required' => true),
- 'id_option' => array(),
- 'price' => array(),
- )
- ),
'services' => array(
'resource' => 'service',
'fields' => array(
@@ -5426,6 +5422,31 @@ class ProductCore extends ObjectModel
return Cache::retrieve($key);
}
+ /**
+ * Returns the tourism tax rules group assigned to a product, mirroring
+ * getIdTaxRulesGroupByIdProduct() for tourism tax's own product_shop column.
+ *
+ * @param int $id_product
+ * @param Context|null $context
+ * @return int
+ */
+ public static function getIdTourismTaxRulesGroupByIdProduct($id_product, ?Context $context = null)
+ {
+ if (!$context) {
+ $context = Context::getContext();
+ }
+ $key = 'product_id_tourism_tax_rules_group_'.(int)$id_product.'_'.(int)$context->shop->id;
+ if (!Cache::isStored($key)) {
+ $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_tourism_tax_rules_group`
+ FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_product` = '.(int)$id_product.' AND id_shop='.(int)$context->shop->id);
+ Cache::store($key, (int)$result);
+ return (int)$result;
+ }
+ return Cache::retrieve($key);
+ }
+
/**
* Returns tax rate.
*
@@ -6627,35 +6648,6 @@ class ProductCore extends ObjectModel
);
}
- public function getWsExtraDemands()
- {
- $objHotelRoomTypeDemand = new HotelRoomTypeDemand();
- $selectedDemands = Db::getInstance()->executeS(
- 'SELECT `id_global_demand` as `id` FROM `'._DB_PREFIX_.'htl_room_type_demand`
- WHERE `id_product` = '.(int)$this->id
- );
- $res = array();
- $demands = $objHotelRoomTypeDemand->getRoomTypeDemands($this->id);
- if ($selectedDemands) {
- foreach ($selectedDemands as $id_demand => $demand) {
- $option['id'] = $demand['id'];
- if (isset($demands[$demand['id']]['adv_option']) && count($demands[$demand['id']]['adv_option'])) {
- foreach ($demands[$demand['id']]['adv_option'] as $id_option => $adv_option) {
- $option['id_option'] = $id_option;
- $option['price'] = $adv_option['price_tax_excl'];
- $res[] = $option;
- }
- } else {
- $option['id_option'] = false;
- $option['price'] = $demand['price_tax_excl'];
- $res[] = $option;
- }
- }
- }
-
- return $res;
- }
-
public function getWsServices()
{
return Db::getInstance()->executeS(
@@ -6718,59 +6710,6 @@ class ProductCore extends ObjectModel
return $this->delete();
}
- public function setWsExtraDemands($demands)
- {
- Db::getInstance()->execute('
- DELETE FROM `'._DB_PREFIX_.'htl_room_type_demand`
- WHERE `id_product` = '.(int)$this->id
- );
- Db::getInstance()->execute('
- DELETE FROM `'._DB_PREFIX_.'htl_room_type_demand_price`
- WHERE `id_product` = '.(int)$this->id
- );
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- $savedDemands = array();
- foreach ($demands as $globalDemand) {
- if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($globalDemand['id']))) {
- if (!isset($savedDemands[$globalDemand['id']])) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $this->id;
- $objRoomTypeDemand->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemand->save();
- $savedDemands[$globalDemand['id']] = $objRoomTypeDemand->id;
- }
-
- if (isset($globalDemand['price'])) {
- if ($objAdvOption->getGlobalDemandAdvanceOptions($objGlobalDemand->id)
- && isset($globalDemand['id_option'])
- && Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($globalDemand['id_option']))
- ) {
- if ($globalDemand['price'] != $objAdvOption->price) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $this->id;
- $objRoomTypeDemandPrice->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemandPrice->id_option = $objAdvOption->id;
- $objRoomTypeDemandPrice->price = $globalDemand['price'];
- $objRoomTypeDemandPrice->save();
- }
- } else {
- // save selected demands prices for this room type
- if ($objGlobalDemand->price != $globalDemand['price']) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $this->id;
- $objRoomTypeDemandPrice->id_global_demand = $objGlobalDemand->id;
- $objRoomTypeDemandPrice->id_option = 0;
- $objRoomTypeDemandPrice->price = $globalDemand['price'];
- $objRoomTypeDemandPrice->save();
- }
- }
- }
- }
- }
-
- return true;
- }
-
public function setWsServices($services)
{
Db::getInstance()->execute('
@@ -6833,21 +6772,24 @@ class ProductCore extends ObjectModel
$idAddress = null,
$useReduc = 1,
$idGroup = null,
- $idCartBooking = 0
+ $idCartBooking = 0,
+ $includeTourismTax = false,
+ $numAdults = null,
+ $childrenAges = null
) {
if ($useTax === null) {
$useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
}
$price = Product::getPriceStatic(
- (int)$idProduct,
+ $idProduct,
$useTax,
$idProductOption,
6,
null,
false,
$useReduc,
- (int)$quantity,
+ $quantity,
false,
null,
$idCart,
@@ -6857,8 +6799,8 @@ class ProductCore extends ObjectModel
true,
null,
true,
- (int)$idHotel,
- (int)$idProductRoomType,
+ $idHotel,
+ $idProductRoomType,
$idGroup,
$idCartBooking
);
@@ -6879,22 +6821,56 @@ class ProductCore extends ObjectModel
)
);
- if (Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY
- && $dateFrom && $dateTo
- ) {
+ $isPerDay = Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY
+ && $dateFrom && $dateTo;
+ if ($isPerDay) {
$price = $price * HotelHelper::getNumberOfDays($dateFrom, $dateTo);
}
- $price = $price * (int)$quantity;
+ $price = $price * $quantity;
- if (!$specificPrice || ($specificPrice['id_cart'] == 0 && $specificPrice['id_htl_cart_booking'] == 0)) {
- if (!$idGroup || !Validate::isLoadedObject(new Group((int)$idGroup))) {
- $idGroup = (int)Group::getCurrent()->id;
+ $tourismTaxHotelId = $idHotel;
+ if (!$tourismTaxHotelId && $idProductRoomType) {
+ $objRoomType = new HotelRoomType();
+ if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProductRoomType)) {
+ $tourismTaxHotelId = $roomTypeInfo['id_hotel'];
}
- $price = Product::applyGroupDiscount($price, $idProduct, $idGroup);
}
+
+ if ($includeTourismTax && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))) {
+ $priceCalcNumDays = $isPerDay ? HotelHelper::getNumberOfDays($dateFrom, $dateTo) : 1;
+ $unitPriceExcl = ($useTax ? Product::getServiceProductPrice($idProduct, $idProductOption, $idHotel, $idProductRoomType, false, 1, $dateFrom, $dateTo, $idCart, $idAddress, $useReduc, $idGroup, $idCartBooking) : $price / (int) $quantity) / $priceCalcNumDays;
+
+ $fallbackAddress = new Address(Cart::getIdAddressForTaxCalculation($idProduct));
+ if ($numAdults === null) {
+ $taxContext = TaxConfiguration::resolveServiceLineTaxContext($tourismTaxHotelId, 0, $fallbackAddress, $idCartBooking);
+ } else {
+ // caller supplied its own occupancy (e.g. a live search form) — use it as-is, only resolve address/collection type
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($tourismTaxHotelId, $fallbackAddress);
+ $taxContext = array(
+ 'address' => $hotelContext['address'],
+ 'collectionType' => $hotelContext['collectionType'],
+ 'checkInDate' => $dateFrom,
+ 'numNights' => max(1, HotelHelper::getNumberOfDays($dateFrom, $dateTo)),
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges ?: array(),
+ );
+ }
+
+ // no $idCurrency passed — TaxCalculator::getTaxesAmount() already resolves it from the current context when null
+ $taxCalculator = TaxManagerFactory::getManager($taxContext['address'], $idTourismTaxRulesGroup)->getTaxCalculator();
+ $price += $taxCalculator->getTaxesTotalAmount(
+ $unitPriceExcl,
+ $taxContext['checkInDate'],
+ $taxContext['numNights'],
+ $taxContext['numAdults'],
+ $taxContext['childrenAges'],
+ $taxContext['collectionType'],
+ $quantity
+ );
+ }
+
return $price;
-
}
/**
diff --git a/classes/Source.php b/classes/Source.php
new file mode 100644
index 000000000..4f453e96b
--- /dev/null
+++ b/classes/Source.php
@@ -0,0 +1,241 @@
+ 'source',
+ 'primary' => 'id_source',
+ 'multilang' => true,
+ 'fields' => array(
+ 'id_business_source' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'code' => array('type' => self::TYPE_STRING, 'validate' => 'isModuleName', 'required' => true, 'size' => 64),
+ 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'unremovable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ ),
+ );
+
+ public function add($autodate = true, $nullValues = false)
+ {
+ if ($this->position <= 0) {
+ $this->position = Source::getHigherPosition($this->id_business_source) + 1;
+ }
+
+ return parent::add($autodate, $nullValues);
+ }
+
+ public static function getHigherPosition($idBusinessSource)
+ {
+ $position = Db::getInstance()->getValue(
+ 'SELECT MAX(`position`) FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$idBusinessSource.' AND `deleted` = 0'
+ );
+
+ return is_numeric($position) ? (int)$position : -1;
+ }
+
+ public function updatePosition($way, $position)
+ {
+ if (!$res = Db::getInstance()->executeS('
+ SELECT `position`, `id_source`
+ FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$this->id_business_source.' AND `deleted` = 0
+ ORDER BY `position` ASC'
+ )) {
+ return false;
+ }
+
+ $moved_item = null;
+ foreach ($res as $row) {
+ if ((int)$row['id_source'] == (int)$this->id) {
+ $moved_item = $row;
+ }
+ }
+
+ if (!$moved_item) {
+ return false;
+ }
+
+ return (Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = `position` '.($way ? '- 1' : '+ 1').'
+ WHERE `id_business_source` = '.(int)$this->id_business_source.' AND `deleted` = 0 AND `position`
+ '.($way
+ ? '> '.(int)$moved_item['position'].' AND `position` <= '.(int)$position
+ : '< '.(int)$moved_item['position'].' AND `position` >= '.(int)$position)
+ ) && Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = '.(int)$position.'
+ WHERE `id_source` = '.(int)$moved_item['id_source']));
+ }
+
+ public static function codeExists($code, $idExclude = 0)
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source`
+ WHERE `code` = \''.pSQL($code).'\' AND `id_source` != '.(int)$idExclude
+ );
+ }
+
+ public static function getIdByCode($code)
+ {
+ return (int)Db::getInstance()->getValue(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source`
+ WHERE `code` = \''.pSQL($code).'\' AND `deleted` = 0'
+ );
+ }
+
+ public static function getUnremovableIds()
+ {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT `id_source` FROM `'._DB_PREFIX_.'source` WHERE `unremovable` = 1 AND `deleted` = 0'
+ );
+
+ return array_map('intval', array_column($rows, 'id_source'));
+ }
+
+ public static function getActiveSource($idBusinessSource, $idSource, $idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT a.`id_source`, al.`name`
+ FROM `'._DB_PREFIX_.'source` a
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` al ON (al.`id_source` = a.`id_source` AND al.`id_lang` = '.(int)$idLang.')
+ WHERE a.`id_business_source` = '.(int)$idBusinessSource.' AND a.`deleted` = 0 AND a.`id_source` NOT IN ('.(int)$idSource.') AND a.`active` = 1
+ ORDER BY a.`position` ASC
+ ');
+ }
+
+ public static function getAllSource($active = null, $idLang = null)
+ {
+ $idLang = $idLang ?: (int)Context::getContext()->language->id;
+
+ $where = ' WHERE a.`deleted` = 0';
+ if ($active !== null) {
+ $where .= ' AND a.`active` = '.(int)(bool)$active;
+ }
+
+ return Db::getInstance()->executeS('
+ SELECT a.`id_source`, a.`id_business_source`, a.`code`, al.`name`, bsl.`name` AS `business_source_name`
+ FROM `'._DB_PREFIX_.'source` a
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` al ON (al.`id_source` = a.`id_source` AND al.`id_lang` = '.(int)$idLang.')
+ LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl ON (bsl.`id_business_source` = a.`id_business_source` AND bsl.`id_lang` = '.(int)$idLang.')
+ '.$where.'
+ ORDER BY a.`id_business_source` ASC, a.`position` ASC
+ ');
+ }
+
+ public static function getSourcesUsedInOrders($idLang)
+ {
+ return Db::getInstance()->executeS('
+ SELECT DISTINCT o.`id_source`, sl.`name`
+ FROM `'._DB_PREFIX_.'orders` o
+ INNER JOIN `'._DB_PREFIX_.'source` s ON (s.`id_source` = o.`id_source`)
+ LEFT JOIN `'._DB_PREFIX_.'source_lang` sl ON (sl.`id_source` = s.`id_source` AND sl.`id_lang` = '.(int)$idLang.')
+ ');
+ }
+
+ public static function cleanPositions($idBusinessSource)
+ {
+ $return = true;
+
+ $result = Db::getInstance()->executeS('
+ SELECT `id_source`
+ FROM `'._DB_PREFIX_.'source`
+ WHERE `id_business_source` = '.(int)$idBusinessSource.' AND `deleted` = 0
+ ORDER BY `position` ASC'
+ );
+
+ $i = 0;
+ foreach ($result as $row) {
+ $return = Db::getInstance()->execute('
+ UPDATE `'._DB_PREFIX_.'source`
+ SET `position` = '.(int)$i++.'
+ WHERE `id_source` = '.(int)$row['id_source']
+ ) && $return;
+ }
+
+ return $return;
+ }
+
+ public function isRemovable()
+ {
+ return !$this->unremovable;
+ }
+
+ public function isUsedByOrder()
+ {
+ return (bool)Db::getInstance()->getValue(
+ 'SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` WHERE `id_source` = '.(int)$this->id
+ );
+ }
+
+ public function mergeOrdersInto($idTargetSource)
+ {
+ return (bool)Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'orders` SET `id_source` = '.(int)$idTargetSource.' WHERE `id_source` = '.(int)$this->id
+ );
+ }
+
+ public static function getTotalOrderCount()
+ {
+ return (int)Db::getInstance()->getValue('SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders`');
+ }
+
+ public function delete()
+ {
+ if (!$this->isRemovable()) {
+ return false;
+ }
+
+ if ($this->isUsedByOrder()) {
+ $this->deleted = 1;
+ if (!$this->update()) {
+ return false;
+ }
+ } elseif (!parent::delete()) {
+ return false;
+ }
+
+ return Source::cleanPositions($this->id_business_source);
+ }
+
+ public static function getDefaultSourceId()
+ {
+ return (int)Configuration::get('PS_DEFAULT_BOOKING_SOURCE');
+ }
+}
diff --git a/classes/Translate.php b/classes/Translate.php
index 7fac82462..8da0d39c5 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -255,8 +255,10 @@ class TranslateCore
$i18n_file = $override_i18n_file;
}
- if (!include($i18n_file)) {
- Tools::displayError(sprintf('Cannot include PDF translation language file : %s', $i18n_file));
+ if (file_exists($i18n_file)) {
+ if (!include($i18n_file)) {
+ Tools::displayError(sprintf('Cannot include PDF translation language file : %s', $i18n_file));
+ }
}
if (!isset($_LANGPDF) || !is_array($_LANGPDF)) {
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 5252400ca..782f01f4a 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -660,11 +660,11 @@ class FrontControllerCore extends Controller
}
/**
- * Renders and outputs maintenance page and ends controller process.
+ * Redirects a cursed request (e.g. an invalid/expired access token) to page not found and ends controller process.
*/
public function initCursedPage()
{
- $this->displayMaintenancePage();
+ Tools::redirect($this->context->link->getPageLink('pagenotfound'));
}
/**
diff --git a/classes/helper/HelperKpiRow.php b/classes/helper/HelperKpiRow.php
index f47022bf7..b10bce643 100644
--- a/classes/helper/HelperKpiRow.php
+++ b/classes/helper/HelperKpiRow.php
@@ -44,7 +44,7 @@ class HelperKpiRowCore extends Helper
if (isset($this->context->cookie->$cookieKey)) {
$kpi->visible = (bool) $this->context->cookie->$cookieKey;
} else {
- $kpi->visible = true;
+ $kpi->visible = isset($kpi->visible) ? (bool) $kpi->visible : true;
}
$countVisible = $kpi->visible ? ++$countVisible : $countVisible;
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 6c7b33e11..b1097b0e2 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -271,6 +271,7 @@ class OrderCore extends ObjectModel
'invoice_date' => array('type' => self::TYPE_DATE),
'delivery_date' => array('type' => self::TYPE_DATE),
'source' => array('type' => self::TYPE_STRING),
+ 'id_source' => array('type' => self::TYPE_INT),
'valid' => array('type' => self::TYPE_BOOL),
'reference' => array('type' => self::TYPE_STRING),
'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0),
@@ -1161,16 +1162,25 @@ class OrderCore extends ObjectModel
$selling_preference_type = null,
$product_auto_add = null,
$product_price_addition_type = null,
- $ids_order_detail = []
+ $ids_order_detail = [],
+ $includeTourismTax = true
) {
/* Retro-compatibility (now set directly on the validateOrder() method) */
if (!$products) {
$products = $this->getProductsDetail($bookingProducts, $selling_preference_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
}
+ $tourismTaxByOrderDetail = array();
+ if (!$includeTourismTax && $products) {
+ $tourismTaxByOrderDetail = OrderTaxDetail::getAmountsByOrderDetail((int) $this->id);
+ }
+
$return = 0;
foreach ($products as $row) {
$return += $row['total_price_tax_incl'];
+ if (!$includeTourismTax) {
+ $return -= isset($tourismTaxByOrderDetail[$row['id_order_detail']]) ? $tourismTaxByOrderDetail[$row['id_order_detail']] : 0;
+ }
}
return $return;
@@ -1821,10 +1831,11 @@ class OrderCore extends ObjectModel
// 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
+ FROM `'._DB_PREFIX_.'order_tax_detail` odt
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
WHERE od.`id_order` = '.(int)$this->id.'
- AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD
+ AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)'
);
}
@@ -2152,61 +2163,6 @@ class OrderCore extends ObjectModel
return $this->update();
}
- /**
- * Returns the correct product taxes breakdown.
- *
- * @since 1.5.0.1
- * @return array
- */
- public function getProductTaxesBreakdown()
- {
- $tmp_tax_infos = array();
- if ($this->useOneAfterAnotherTaxComputationMethod()) {
- // sum by taxes
- $taxes_by_tax = Db::getInstance()->executeS('
- SELECT odt.`id_order_detail`, t.`name`, t.`rate`, SUM(`total_amount`) AS `total_amount`
- FROM `'._DB_PREFIX_.'order_detail_tax` odt
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
- LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
- WHERE od.`id_order` = '.(int)$this->id.'
- GROUP BY odt.`id_tax`
- ');
-
- // format response
- $tmp_tax_infos = array();
- foreach ($taxes_by_tax as $tax_infos) {
- $tmp_tax_infos[$tax_infos['rate']]['total_amount'] = $tax_infos['tax_amount'];
- $tmp_tax_infos[$tax_infos['rate']]['name'] = $tax_infos['name'];
- }
- } else {
- // sum by order details in order to retrieve real taxes rate
- $taxes_infos = Db::getInstance()->executeS('
- SELECT odt.`id_order_detail`, t.`rate` AS `name`, SUM(od.`total_price_tax_excl`) AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`
- FROM `'._DB_PREFIX_.'order_detail_tax` odt
- LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
- LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
- WHERE od.`id_order` = '.(int)$this->id.'
- GROUP BY odt.`id_order_detail`
- ');
-
- // sum by taxes
- $tmp_tax_infos = array();
- foreach ($taxes_infos as $tax_infos) {
- if (!isset($tmp_tax_infos[$tax_infos['rate']])) {
- $tmp_tax_infos[$tax_infos['rate']] = array('total_amount' => 0,
- 'name' => 0,
- 'total_price_tax_excl' => 0);
- }
-
- $tmp_tax_infos[$tax_infos['rate']]['total_amount'] += $tax_infos['total_amount'];
- $tmp_tax_infos[$tax_infos['rate']]['name'] = $tax_infos['name'];
- $tmp_tax_infos[$tax_infos['rate']]['total_price_tax_excl'] += $tax_infos['total_price_tax_excl'];
- }
- }
-
- return $tmp_tax_infos;
- }
-
/**
* Returns the shipping taxes breakdown
*
@@ -2538,7 +2494,7 @@ class OrderCore extends ObjectModel
} else {
$order_details = $this->getOrderDetailList();
}
- $expected_total_tax = (float)$this->getTotalProductsWithTaxes($limitToOrderDetails) - (float)$this->getTotalProductsWithoutTaxes($limitToOrderDetails);
+ $expected_total_tax = (float)$this->getTotalProductsWithTaxes($limitToOrderDetails, null, null, null, null, [], false) - (float)$this->getTotalProductsWithoutTaxes($limitToOrderDetails);
$order_ecotax_tax = 0;
@@ -3157,15 +3113,11 @@ class OrderCore extends ObjectModel
$totalRoomsAndServices = $this->getTotalProductsWithoutTaxes();
}
- // Get total of extra demands
- $objBookingDemand = new HotelBookingDemands();
- $totalExtraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands($this->id, 0, 0, 0, 0, 0, 1, $useTax);
-
// Get cart rules total
$orderTotalDiscount = $this->getCartRulesTotal($useTax);
// Update order with new amounts after removing cart rule
- $totalOrder = ($totalExtraDemands + $totalRoomsAndServices) - $orderTotalDiscount;
+ $totalOrder = $totalRoomsAndServices - $orderTotalDiscount;
$totalOrder = $totalOrder > 0 ? $totalOrder : 0;
return $totalOrder;
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index cce75207a..2275f7811 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -218,7 +218,7 @@ class OrderDetailCore extends ObjectModel
'tax_computation_method' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'ecotax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
- 'ecotax_tax_rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
+ 'ecotax_tax_rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
'discount_quantity_applied' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
'download_hash' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'),
'download_nb' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
@@ -292,7 +292,11 @@ class OrderDetailCore extends ObjectModel
return false;
}
- Db::getInstance()->delete('order_detail_tax', 'id_order_detail='.(int)$this->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$this->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
return $res;
}
@@ -345,15 +349,23 @@ class OrderDetailCore extends ObjectModel
public static function getTaxCalculatorStatic($id_order_detail)
{
$sql = 'SELECT t.*, d.`tax_computation_method`
- FROM `'._DB_PREFIX_.'order_detail_tax` t
+ FROM `'._DB_PREFIX_.'order_tax_detail` t
LEFT JOIN `'._DB_PREFIX_.'order_detail` d ON (d.`id_order_detail` = t.`id_order_detail`)
- WHERE d.`id_order_detail` = '.(int)$id_order_detail;
+ WHERE d.`id_order_detail` = '.(int)$id_order_detail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = t.`id_tax` AND tc.`is_tourism_tax` = 1)';
$computation_method = 1;
$taxes = array();
+ $seenTaxIds = array();
if ($results = Db::getInstance()->executeS($sql)) {
foreach ($results as $result) {
- $taxes[] = new Tax((int)$result['id_tax']);
+ $idTax = (int) $result['id_tax'];
+ if (isset($seenTaxIds[$idTax])) {
+
+ continue;
+ }
+ $seenTaxIds[$idTax] = true;
+ $taxes[] = new Tax($idTax);
}
$computation_method = $result['tax_computation_method'];
@@ -449,26 +461,30 @@ class OrderDetailCore extends ObjectModel
0,
$taxGroupInfo['id_room_type'],
)) {
- $serviceProductData = array_shift($serviceProductData);
- $numDays = 1;
- if ((Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method)
- && (!$numDays = HotelHelper::getNumberOfDays($serviceProductData['date_from'], $serviceProductData['date_to']))
- ) {
- $numDays = 1;
+ $quantity = 0;
+ $totalPriceTaxExcl = 0.0;
+ $firstServiceProduct = null;
+ foreach ($serviceProductData as $bookingServiceData) {
+ $bookingNumDays = 1;
+ if (Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method) {
+ $bookingNumDays = HotelHelper::getNumberOfDays($bookingServiceData['date_from'], $bookingServiceData['date_to']) ?: 1;
+ }
+ foreach ($bookingServiceData['additional_services'] as $item) {
+ $itemQuantity = (isset($item['quantity']) ? $item['quantity'] : 0) * $bookingNumDays;
+ $quantity += $itemQuantity;
+ $totalPriceTaxExcl += $itemQuantity * (isset($item['unit_price_tax_excl']) ? $item['unit_price_tax_excl'] : 0);
+ if ($firstServiceProduct === null) {
+ $firstServiceProduct = $item;
+ }
+ }
}
- $quantity = array_reduce($serviceProductData['additional_services'], function ($totalQty, $item) {
- return $totalQty + (isset($item['quantity']) ? $item['quantity'] : 0);
- }, 0);
+ $unit_price_tax_excl = $quantity > 0 ? ($totalPriceTaxExcl / $quantity) : 0;
- $firstServiceProduct = array_shift($serviceProductData['additional_services']);
-
- $unit_price_tax_excl = isset($firstServiceProduct['unit_price_tax_excl']) ? $firstServiceProduct['unit_price_tax_excl'] : 0;
-
- $quantity = $quantity * $numDays;
-
- $tax_manager = TaxManagerFactory::getManager($this->vat_address, (int)$firstServiceProduct['id_tax_rules_group']);
- $this->tax_calculator = $tax_manager->getTaxCalculator();
+ if ($firstServiceProduct) {
+ $tax_manager = TaxManagerFactory::getManager($this->vat_address, (int)$firstServiceProduct['id_tax_rules_group']);
+ $this->tax_calculator = $tax_manager->getTaxCalculator();
+ }
} elseif ($serviceProductData = $objServiceProductCartDetail->getServiceProductsInCart(
$idCart,
array(),
@@ -477,22 +493,21 @@ class OrderDetailCore extends ObjectModel
$taxGroupInfo['id_room_type'],
$this->product_id
)) {
-
- $quantity = array_reduce($serviceProductData, function ($totalQty, $item) {
- return $totalQty + (isset($item['quantity']) ? $item['quantity'] : 0);
- }, 0);
-
- $serviceProductData = array_shift($serviceProductData);
- $unit_price_tax_excl = isset($serviceProductData['unit_price_tax_excl']) ? $serviceProductData['unit_price_tax_excl'] : 0;
-
- $numDays = 1;
- if ((Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method)
- && (!$numDays = HotelHelper::getNumberOfDays($serviceProductData['date_from'], $serviceProductData['date_to']))
- ) {
- $numDays = 1;
+ // Same sum-across-every-row fix as above, cart-side: don't let array_shift() collapse
+ // the representative unit price/day-count down to just the first cart row.
+ $quantity = 0;
+ $totalPriceTaxExcl = 0.0;
+ foreach ($serviceProductData as $cartServiceItem) {
+ $itemNumDays = 1;
+ if (Product::PRICE_CALCULATION_METHOD_PER_DAY == $this->product_price_calculation_method) {
+ $itemNumDays = HotelHelper::getNumberOfDays($cartServiceItem['date_from'], $cartServiceItem['date_to']) ?: 1;
+ }
+ $itemQuantity = (isset($cartServiceItem['quantity']) ? $cartServiceItem['quantity'] : 0) * $itemNumDays;
+ $quantity += $itemQuantity;
+ $totalPriceTaxExcl += $itemQuantity * (isset($cartServiceItem['unit_price_tax_excl']) ? $cartServiceItem['unit_price_tax_excl'] : 0);
}
- $quantity = $quantity * $numDays;
+ $unit_price_tax_excl = $quantity > 0 ? ($totalPriceTaxExcl / $quantity) : 0;
}
if ($this->tax_calculator == null) {
@@ -512,7 +527,7 @@ class OrderDetailCore extends ObjectModel
$total_amount = Tools::processPriceRounding($amount, $quantity, $order->round_type, $order->round_mode);
- $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.'),';
+ $values .= '('.(int)$order->id.','.(int)$this->id.',0,0,'.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.',NOW()),';
}
}
}
@@ -546,7 +561,7 @@ class OrderDetailCore extends ObjectModel
$total_amount = Tools::processPriceRounding($amount, $this->product_quantity, $order->round_type, $order->round_mode);
- $values .= '('.(int)$this->id.','.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.'),';
+ $values .= '('.(int)$order->id.','.(int)$this->id.',0,0,'.(int)$id_tax.','.(float)$amount.','.(float)$total_amount.',NOW()),';
}
}
@@ -554,10 +569,15 @@ class OrderDetailCore extends ObjectModel
if ($values) {
if ($replace) {
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$this->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$this->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
}
- $sql = 'INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (id_order_detail, id_tax, unit_amount, total_amount)
+ $sql = 'INSERT INTO `'._DB_PREFIX_.'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
VALUES '.$values;
return Db::getInstance()->execute($sql);
@@ -573,7 +593,10 @@ class OrderDetailCore extends ObjectModel
$tax_manager = TaxManagerFactory::getManager($address, (int)Product::getIdTaxRulesGroupByIdProduct((int)$this->product_id, $this->context));
$this->tax_calculator = $tax_manager->getTaxCalculator();
- return $this->saveTaxCalculator($order, true);
+ $result = $this->saveTaxCalculator($order, true);
+ OrderTaxDetail::rescopeVatAfterReset((int) $this->id);
+
+ return $result;
}
/**
@@ -593,9 +616,25 @@ class OrderDetailCore extends ObjectModel
public static function getTaxListStatic($id_order_detail)
{
- $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_detail_tax`
- WHERE `id_order_detail` = '.(int)$id_order_detail;
- return Db::getInstance()->executeS($sql);
+ $sql = 'SELECT * FROM `'._DB_PREFIX_.'order_tax_detail` t
+ WHERE t.`id_order_detail` = '.(int)$id_order_detail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = t.`id_tax` AND tc.`is_tourism_tax` = 1)';
+ $rows = Db::getInstance()->executeS($sql);
+ if (!$rows) {
+ return $rows;
+ }
+
+ $seenTaxIds = array();
+ $deduped = array();
+ foreach ($rows as $row) {
+ if (isset($seenTaxIds[$row['id_tax']])) {
+ continue;
+ }
+ $seenTaxIds[$row['id_tax']] = true;
+ $deduped[] = $row;
+ }
+
+ return $deduped;
}
/*
@@ -729,6 +768,11 @@ class OrderDetailCore extends ObjectModel
$this->total_price_tax_incl = (float)$product['total_wt'];
$this->total_price_tax_excl = (float)$product['total'];
+ if (isset($this->tax_calculator) && Product::getIdTourismTaxRulesGroupByIdProduct((int) $product['id_product'])) {
+ $this->unit_price_tax_incl = $this->tax_calculator->addTaxes($this->unit_price_tax_excl);
+ $this->total_price_tax_incl = $this->tax_calculator->addTaxes($this->total_price_tax_excl);
+ }
+
$this->purchase_supplier_price = (float)$product['wholesale_price'];
if ($product['id_supplier'] > 0 && ($supplier_price = ProductSupplier::getProductPrice((int)$product['id_supplier'], $product['id_product'], $product['id_product_attribute'], true)) > 0) {
$this->purchase_supplier_price = (float)$supplier_price;
@@ -896,10 +940,11 @@ class OrderDetailCore extends ObjectModel
public function getWsTaxes()
{
$query = new DbQuery();
- $query->select('id_tax as id');
- $query->from('order_detail_tax', 'tax');
+ $query->select('tax.`id_tax` as id');
+ $query->from('order_tax_detail', 'tax');
$query->leftJoin('order_detail', 'od', 'tax.`id_order_detail` = od.`id_order_detail`');
$query->where('od.`id_order_detail` = '.(int)$this->id_order_detail);
+ $query->where('NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = tax.`id_tax` AND tc.`is_tourism_tax` = 1)');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
}
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 9d097b5d4..83ba35ce1 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -147,6 +147,28 @@ class OrderInvoiceCore extends ObjectModel
'.($this->id && $this->number ? ' AND od.`id_order_invoice` = '.(int)$this->id : '').' ORDER BY od.`product_name`');
}
+ /**
+ * Recompute this invoice's totals live from its own order_detail lines, instead of trusting
+ * accumulated deltas. Mirrors Order::getOrderTotal()'s formula, scoped to this invoice only.
+ *
+ * @return bool
+ */
+ public function recomputeTotalsFromLines()
+ {
+ $order = new Order((int) $this->id_order);
+ $invoiceProducts = $this->getProductsDetail();
+
+ $totalProductsTe = $order->getTotalProductsWithoutTaxes($invoiceProducts);
+ $totalProductsTi = $order->getTotalProductsWithTaxes($invoiceProducts);
+
+ $this->total_products = $totalProductsTe;
+ $this->total_products_wt = $totalProductsTi;
+ $this->total_paid_tax_excl = max(0, $totalProductsTe + $this->total_shipping_tax_excl + $this->total_wrapping_tax_excl - $this->total_discount_tax_excl);
+ $this->total_paid_tax_incl = max(0, $totalProductsTi + $this->total_shipping_tax_incl + $this->total_wrapping_tax_incl - $this->total_discount_tax_incl);
+
+ return $this->update();
+ }
+
public static function getInvoiceByNumber($id_invoice)
{
if (is_numeric($id_invoice)) {
@@ -323,11 +345,12 @@ class OrderInvoiceCore extends ObjectModel
// 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
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` 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)
+ AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD . '
+ AND NOT EXISTS (SELECT 1 FROM `' . _DB_PREFIX_ . 'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)')
|| Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
}
@@ -662,71 +685,6 @@ class OrderInvoiceCore extends ObjectModel
return $breakdown;
}
- public function getExtraDemandTaxesBreakdown($order = null)
- {
- if (!$order) {
- $order = $this->getOrder();
- }
- $breakdown = array();
- $order_details = $this->getProducts();
- $objBookingDemand = new HotelBookingDemands();
- $order_details = array_column($order_details, 'id_order_detail');
- $details = $objBookingDemand->getExtraDemandsTaxesDetails($order->id, $order_details);
- if (!$this->useOneAfterAnotherTaxComputationMethod()) {
- $grouped_details = array();
- foreach ($details as $row) {
- if (!isset($grouped_details[$row['id_htl_booking']][$row['id_booking_demand']])) {
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']] = array(
- 'tax_rate' => 0,
- 'total_tax_base' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- );
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['total_tax_base'] += $row['total_price_tax_excl'];
- }
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['total_amount'] += $row['total_amount'];
- $grouped_details[$row['id_htl_booking']][$row['id_booking_demand']]['tax_rate'] += $row['rate'];
- }
- $details = $grouped_details;
- foreach ($details as $detail) {
- foreach ($detail as $row) {
- $rate = sprintf('%.3f', $row['tax_rate']);
- if (!isset($breakdown[$rate])) {
- $breakdown[$rate] = array(
- 'total_price_tax_excl' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- 'rate' =>$rate,
- );
- }
- $breakdown[$rate]['total_price_tax_excl'] += $row['total_tax_base'];
- $breakdown[$rate]['total_amount'] += $row['total_amount'];
- }
- }
- } else {
- foreach ($details as $row) {
- $key = $row['id_tax'];
- $rate = sprintf('%.3f', $row['rate']);
- if (!isset($breakdown[$key])) {
- $breakdown[$key] = array(
- 'total_price_tax_excl' => 0,
- 'total_amount' => 0,
- 'id_tax' => $row['id_tax'],
- 'rate' => $rate,
- );
- }
- $breakdown[$key]['total_price_tax_excl'] += $row['total_tax_base'];
- $breakdown[$key]['total_amount'] += $row['total_amount'];
- }
- }
- foreach ($breakdown as $rate => $data) {
- $breakdown[$rate]['total_price_tax_excl'] = Tools::ps_round($data['total_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_, $order->round_mode);
- $breakdown[$rate]['total_amount'] = Tools::ps_round($data['total_amount'], _PS_PRICE_COMPUTE_PRECISION_, $order->round_mode);
- }
-
- return $breakdown;
- }
-
/**
* Returns the shipping taxes breakdown
*
@@ -860,6 +818,28 @@ class OrderInvoiceCore extends ObjectModel
return $wrapping_breakdown;
}
+ /**
+ * Return tourism tax breakdown grouped by id_tax for invoice display. Collapsed into a single
+ * combined row when the invoice's tax breakdown display is off — same rule every other tax
+ * category (rooms, services, ...) already applies via useOneAfterAnotherTaxComputationMethod().
+ *
+ * @return array [['tax_name' => string, 'total_amount' => float], ...]
+ */
+ public function getTourismTaxBreakdown()
+ {
+ $breakdown = OrderTaxDetail::getBreakdownForInvoice((int) $this->id_order);
+ if (!$breakdown || $this->useOneAfterAnotherTaxComputationMethod()) {
+ return $breakdown;
+ }
+
+ $total = 0.0;
+ foreach ($breakdown as $row) {
+ $total += (float) $row['total_amount'];
+ }
+
+ return array(array('id_tax' => 0, 'tax_name' => '', 'total_amount' => $total));
+ }
+
/**
* Returns the ecotax taxes breakdown
*
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index 3da74d335..79785f982 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -203,7 +203,6 @@ class OrderReturnCore extends ObjectModel
}
$objOrder = new Order($idOrder);
- $objBookingDemands = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$calcServicePriceFirst = false;
@@ -211,6 +210,9 @@ class OrderReturnCore extends ObjectModel
$calcServicePriceFirst = true;
}
+ $appliedTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($idOrder, OrderTaxDetail::SCOPE_ROOM);
+ $appliedServiceTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($idOrder, OrderTaxDetail::SCOPE_SERVICE);
+
foreach ($returnDetails as $key => &$bookingRow) {
if ($skipReqCompletedNonRefunded) {
$objReturnState = new OrderReturnState($bookingRow['id_return_state']);
@@ -224,32 +226,9 @@ class OrderReturnCore extends ObjectModel
$bookingRow['extra_service_total_paid_amount'] = 0;
$bookingRow['extra_service_total_price_tax_incl'] = 0;
$bookingRow['room_paid_amount'] = 0;
+ $bookingRow['tourism_tax_applied_amount'] = 0;
+ $bookingRow['tourism_tax_paid_amount'] = 0;
- $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $bookingRow['id_product'],
- $bookingRow['id_room'],
- $bookingRow['date_from'],
- $bookingRow['date_to'],
- 0,
- 0,
- 1,
- $bookingRow['id']
- );
- if (count($roomSelectedDemands)) {
- foreach ($roomSelectedDemands as $demand) {
- if ($demand['total_price_tax_incl'] > 0) {
- if ($objOrder->total_paid_real > 0) {
- if ($calcServicePriceFirst) {
- $bookingRow['extra_service_total_paid_amount'] += $demand['total_price_tax_incl'];
- } else {
- $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/($objOrder->total_paid_tax_incl + $objOrder->total_discounts_tax_incl);
- }
- }
- $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl'];
- }
- }
- }
if ($roomSelectedServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -291,6 +270,12 @@ class OrderReturnCore extends ObjectModel
}
}
}
+ $bookingRow['tourism_tax_applied_amount'] = (isset($appliedTourismTaxByBooking[$bookingRow['id_htl_booking']]) ? (float) $appliedTourismTaxByBooking[$bookingRow['id_htl_booking']] : 0.0)
+ + (isset($appliedServiceTourismTaxByBooking[$bookingRow['id_htl_booking']]) ? (float) $appliedServiceTourismTaxByBooking[$bookingRow['id_htl_booking']] : 0.0);
+ if ($bookingRow['tourism_tax_applied_amount'] > 0 && $objOrder->total_paid_real > 0) {
+ $denominator = $objOrder->total_paid_tax_incl + $objOrder->total_discounts_tax_incl;
+ $bookingRow['tourism_tax_paid_amount'] = $denominator > 0 ? ($objOrder->total_paid_real * $bookingRow['tourism_tax_applied_amount'] / $denominator) : 0.0;
+ }
if ($customerView) {
$dateJoin = $bookingRow['id_product'].'_'.strtotime($bookingRow['date_from']).strtotime($bookingRow['date_to']);
if (isset($returnsCustView[$dateJoin]['num_rooms'])) {
diff --git a/classes/order/OrderTaxDetail.php b/classes/order/OrderTaxDetail.php
new file mode 100644
index 000000000..768c5c3ae
--- /dev/null
+++ b/classes/order/OrderTaxDetail.php
@@ -0,0 +1,1430 @@
+ 'order_tax_detail',
+ 'primary' => 'id_order_tax_detail',
+ 'fields' => array(
+ 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_htl_booking' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_service_product_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'unit_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'total_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ ),
+ );
+
+ /**
+ * Whether a booking's tourism tax (room + every attached service) is currently excluded from totals.
+ *
+ * @param int $idHtlBooking
+ * @return bool
+ */
+ public static function isBookingExempted($idHtlBooking)
+ {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT 1 FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = ' . (int) $idHtlBooking . '
+ AND `id_service_product_order_detail` = 0'
+ );
+ }
+
+ /**
+ * Whether a standalone (no room attachment) service line is currently excluded from totals.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @return bool
+ */
+ public static function isServiceLineExempted($idServiceProductOrderDetail)
+ {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT 1 FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = 0
+ AND `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ }
+
+ /**
+ * Delete the exemption marker for a booking or standalone service line — id_htl_booking=0 for the
+ * latter, id_service_product_order_detail=0 for the former (their own two-shape storage key).
+ * Kept as a shared helper since it's used 3 times (hardDeleteForBooking, applyBooking, applyServiceLine).
+ *
+ * @param int $idHtlBooking
+ * @param int $idServiceProductOrderDetail
+ * @return bool
+ */
+ protected static function deleteExemptionMarker($idHtlBooking, $idServiceProductOrderDetail)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'order_tax_exemption`
+ WHERE `id_htl_booking` = ' . (int) $idHtlBooking . '
+ AND `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax totals for every booking of an order, keyed by id_htl_booking — cached per order.
+ *
+ * @param int $idOrder
+ * @param int $scope self::SCOPE_ROOM (default) — float per room, keyed by id_htl_booking (room's own tax only)
+ * self::SCOPE_ROOM_STATUS — ['status' => int, 'total' => float] per room, same keys
+ * self::SCOPE_SERVICE — float per room, keyed by the attached room's id_htl_booking
+ * @return array keyed as described above per $scope
+ */
+ public static function getAppliedTourismTaxTotals($idOrder, $scope = self::SCOPE_ROOM)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getAppliedTourismTaxTotals-' . $idOrder . '-' . $scope;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = array();
+ if ($scope === self::SCOPE_SERVICE) {
+ $sql = 'SELECT spod.`id_htl_booking_detail`, SUM(tt.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ INNER JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = tt.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (spod.`id_htl_booking_detail` = 0 AND ex.`id_service_product_order_detail` = tt.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND spod.`id_htl_booking_detail` != 0
+ AND spod.`is_refunded` = 0
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY spod.`id_htl_booking_detail`';
+ $rows = Db::getInstance()->executeS($sql);
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_htl_booking_detail']] = (float) $row['total_amount'];
+ }
+ } else {
+ $rows = Db::getInstance()->executeS(
+ 'SELECT tt.`id_htl_booking`,
+ SUM(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN tt.`total_amount` ELSE 0 END) AS total_amount,
+ MAX(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN 1 ELSE 0 END) AS applied_count
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = tt.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON ex.`id_htl_booking` = tt.`id_htl_booking`
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND tt.`id_htl_booking` != 0
+ AND hbd.`is_refunded` = 0
+ GROUP BY tt.`id_htl_booking`'
+ );
+ foreach ((array) $rows as $row) {
+ if ($scope === self::SCOPE_ROOM_STATUS) {
+ $result[(int) $row['id_htl_booking']] = array(
+ 'status' => ((int) $row['applied_count'] > 0) ? self::STATUS_APPLIED : self::STATUS_EXEMPTED,
+ 'total' => (float) $row['total_amount'],
+ );
+ } else {
+ $result[(int) $row['id_htl_booking']] = (float) $row['total_amount'];
+ }
+ }
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax status+total for every standalone (not attached
+ * to a room) service line of an order, keyed by id_service_product_order_detail — the service-line
+ * equivalent of getAppliedTourismTaxTotals(..., SCOPE_ROOM_STATUS), for lines with no room to fold
+ * their status into.
+ *
+ * @param int $idOrder
+ * @return array [id_service_product_order_detail => ['status' => int, 'total' => float]]
+ */
+ public static function getStandaloneServiceTourismTaxStatuses($idOrder)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getStandaloneServiceTourismTaxStatuses-' . $idOrder;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = array();
+ $rows = Db::getInstance()->executeS(
+ 'SELECT tt.`id_service_product_order_detail`,
+ SUM(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN tt.`total_amount` ELSE 0 END) AS total_amount,
+ MAX(CASE WHEN ex.`id_order_tax_exemption` IS NULL THEN 1 ELSE 0 END) AS applied_count
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` tt
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = tt.`id_tax` AND t.`is_tourism_tax` = 1
+ INNER JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = tt.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON ex.`id_service_product_order_detail` = tt.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0
+ WHERE tt.`id_order` = ' . $idOrder . '
+ AND tt.`id_service_product_order_detail` != 0
+ AND spod.`id_htl_booking_detail` = 0
+ AND spod.`is_refunded` = 0
+ GROUP BY tt.`id_service_product_order_detail`'
+ );
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_service_product_order_detail']] = array(
+ 'status' => ((int) $row['applied_count'] > 0) ? self::STATUS_APPLIED : self::STATUS_EXEMPTED,
+ 'total' => (float) $row['total_amount'],
+ );
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Delete every row (VAT and tourism alike) for a scope — used only when the booking/service line
+ * itself is being permanently removed. Unlike the tourism-only delete in saveTourismTax() (which
+ * runs mid-lifecycle while VAT rows for the same scope still need to survive), this clears everything.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function deleteAllForScope($scopeColumn, $scopeValue)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'order_tax_detail`
+ WHERE `' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Same as deleteAllForScope(), but tourism tax only — VAT rows scoped to the same booking/service
+ * are left untouched. Used before a fresh recompute (re-applying after an exemption) so a changed
+ * tourism tax rule is picked up instead of restoring whatever was stored before the exemption.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function deleteTourismRowsForScope($scopeColumn, $scopeValue)
+ {
+ return Db::getInstance()->execute(
+ 'DELETE otd FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking 0 for a service-line scope
+ * @param int $idServiceProductOrderDetail 0 for a room-booking scope
+ * @return bool
+ */
+ public static function updateVatScoping($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $idHtlBooking = (int) $idHtlBooking;
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $db = Db::getInstance();
+
+ $rawUnscopedRows = $db->executeS(
+ 'SELECT `id_order_tax_detail`, `id_order`, `id_tax`, `total_amount`
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail`
+ WHERE `id_order_detail` = ' . $idOrderDetail . '
+ AND `id_htl_booking` = 0
+ AND `id_service_product_order_detail` = 0'
+ );
+ if (!$rawUnscopedRows) {
+ return true;
+ }
+
+ $unscopedRows = array();
+ foreach ($rawUnscopedRows as $row) {
+ $idTax = (int) $row['id_tax'];
+ if (isset($unscopedRows[$idTax])) {
+ $unscopedRows[$idTax]['total_amount'] += (float) $row['total_amount'];
+ $db->delete('order_tax_detail', '`id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']);
+ continue;
+ }
+ $unscopedRows[$idTax] = $row;
+ $unscopedRows[$idTax]['total_amount'] = (float) $row['total_amount'];
+ }
+
+ if ($idHtlBooking) {
+ $ownPriceTaxExcl = (float) $db->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . $idHtlBooking
+ );
+ } elseif ($idServiceProductOrderDetail) {
+ $ownPriceTaxExcl = (float) $db->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . $idServiceProductOrderDetail
+ );
+ } else {
+ $ownPriceTaxExcl = 0.0;
+ }
+
+ $ownAmounts = OrderDetail::getTaxCalculatorStatic($idOrderDetail)->getTaxesAmount($ownPriceTaxExcl);
+
+ $result = true;
+ foreach ($unscopedRows as $row) {
+ $idTax = (int) $row['id_tax'];
+ $remaining = (float) $row['total_amount'];
+ $claimed = min($remaining, Tools::ps_round(isset($ownAmounts[$idTax]) ? (float) $ownAmounts[$idTax] : 0.0, 6));
+ $remaining = Tools::ps_round($remaining - $claimed, 6);
+
+ $result = $db->execute(
+ 'INSERT INTO `' . _DB_PREFIX_ . 'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
+ VALUES (' . (int) $row['id_order'] . ', ' . $idOrderDetail . ', ' . (int) $idHtlBooking . ', '
+ . (int) $idServiceProductOrderDetail . ', ' . $idTax . ', ' . $claimed . ', '
+ . $claimed . ', NOW())'
+ ) && $result;
+
+ if ($remaining <= 0.000001) {
+ $result = $db->delete('order_tax_detail', '`id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']) && $result;
+ } else {
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_tax_detail`
+ SET `total_amount` = ' . $remaining . '
+ WHERE `id_order_tax_detail` = ' . (int) $row['id_order_tax_detail']
+ ) && $result;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @return bool
+ */
+ public static function rescopeVatAfterReset($idOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $db = Db::getInstance();
+ $result = true;
+
+ $roomIds = $db->executeS(
+ 'SELECT `id` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($roomIds as $row) {
+ $result = self::updateVatScoping($idOrderDetail, (int) $row['id'], 0) && $result;
+ }
+
+ $serviceIds = $db->executeS(
+ 'SELECT `id_service_product_order_detail` FROM `' . _DB_PREFIX_ . 'service_product_order_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($serviceIds as $row) {
+ $result = self::updateVatScoping($idOrderDetail, 0, (int) $row['id_service_product_order_detail']) && $result;
+ }
+
+ if ($roomIds || $serviceIds) {
+ $result = self::recomputeInclusivePrice($idOrderDetail, 0, 0) && $result;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Hard-delete every tax row — VAT and tourism alike — for a booking and its attached service
+ * lines (room removed from an already-placed order), plus the exemption marker if one exists.
+ *
+ * @param int $idHtlBooking
+ * @param int[] $serviceLineIds ServiceProductOrderDetail ids attached to this booking
+ * @return void
+ */
+ public static function hardDeleteForBooking($idHtlBooking, array $serviceLineIds)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ self::deleteAllForScope(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ foreach ($serviceLineIds as $idServiceLine) {
+ self::deleteAllForScope(self::SCOPE_COLUMN_SERVICE, (int) $idServiceLine);
+ }
+ self::deleteExemptionMarker($idHtlBooking, 0);
+ }
+
+ /**
+ * Sum of total_amount for a booking/service-line scope (every row counts — exemption is never
+ * stored on the row itself, it's derived from marker existence at read time).
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return float
+ */
+ protected static function getScopedTotal($scopeColumn, $scopeValue)
+ {
+ return (float) Db::getInstance()->getValue(
+ 'SELECT COALESCE(SUM(otd.`total_amount`), 0)
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Whether tourism tax has never been computed for this scope — no rows exist yet, and none were
+ * ever refunded either. True means a fresh compute (buildRoomTaxParams()/buildServiceLineTaxParams()
+ * + saveTourismTaxFromParams()) is needed instead of restoring/reusing existing rows.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function hasNeverBeenComputed($scopeColumn, $scopeValue)
+ {
+ if (self::hasRefundedRowsForScope($scopeColumn, $scopeValue)) {
+ return false;
+ }
+
+ return !(bool) Db::getInstance()->getValue(
+ 'SELECT otd.`id_order_tax_detail` FROM `' . _DB_PREFIX_ . 'order_tax_detail` otd
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = otd.`id_tax` AND t.`is_tourism_tax` = 1
+ WHERE otd.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * Whether a scope's tax is currently excluded from totals — resolves a service line to its parent
+ * room's marker when attached, its own marker when standalone. Used by saveTourismTax() to decide
+ * whether a freshly (re)computed amount should move the denormalized display totals.
+ *
+ * @param int $idHtlBooking 0 for a service-line scope
+ * @param int $idServiceProductOrderDetail 0 for a room-booking scope
+ * @return bool
+ */
+ protected static function isScopeExempted($idHtlBooking, $idServiceProductOrderDetail)
+ {
+ if ($idHtlBooking) {
+ return self::isBookingExempted($idHtlBooking);
+ }
+ if ($idServiceProductOrderDetail) {
+ $serviceLine = new ServiceProductOrderDetail((int) $idServiceProductOrderDetail);
+ if (Validate::isLoadedObject($serviceLine) && $serviceLine->id_htl_booking_detail) {
+ return self::isBookingExempted((int) $serviceLine->id_htl_booking_detail);
+ }
+ return self::isServiceLineExempted($idServiceProductOrderDetail);
+ }
+ return false;
+ }
+
+ /**
+ * Compute and save tourism tax for one room-booking or service-product line.
+ * @param int $idTaxRulesGroup Tourism TRG assigned to the product
+ * @param Address $address Jurisdiction address (the hotel's own, not the customer's)
+ * @param float $unitPriceTaxExcl Room/service unit_price_tax_excl (% base and tier lookup)
+ * @param string $checkInDate 'YYYY-MM-DD'
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges Ages at check-in date
+ * @param int $idCurrency
+ * @param int $collectionType HotelBranchInformation::tourism_tax_collection_type snapshot
+ * @param int $idLang
+ * @param int $quantity Line quantity multiplier. Rooms: always 1.
+ * @param int $idOrder
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking 0 for service lines
+ * @param int $idServiceProductOrderDetail 0 for room bookings
+ * @return void
+ */
+ public static function saveTourismTax(
+ $idTaxRulesGroup,
+ Address $address,
+ $unitPriceTaxExcl,
+ $checkInDate,
+ $numNights,
+ $numAdults,
+ array $childrenAges,
+ $idCurrency,
+ $collectionType,
+ $idLang,
+ $quantity,
+ $idOrder,
+ $idOrderDetail,
+ $idHtlBooking,
+ $idServiceProductOrderDetail
+ ) {
+ $idTaxRulesGroup = (int) $idTaxRulesGroup;
+ $idOrderDetail = (int) $idOrderDetail;
+ $idOrder = (int) $idOrder;
+ $idHtlBooking = (int) $idHtlBooking;
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ if (!Configuration::get('QLO_USE_TOURISM_TAX') || !$idTaxRulesGroup || !$idOrderDetail) {
+ return;
+ }
+
+ $taxAmounts = array();
+ $validNightsByTax = array();
+ if ($idTaxRulesGroup) {
+ $taxCalculator = TaxManagerFactory::getManager($address, $idTaxRulesGroup)->getTaxCalculator();
+ $taxAmounts = $taxCalculator->getTaxesAmount(
+ $unitPriceTaxExcl,
+ $checkInDate,
+ $numNights,
+ $numAdults,
+ $childrenAges,
+ $collectionType,
+ $quantity,
+ $idCurrency,
+ $validNightsByTax
+ );
+ }
+
+ $scopeColumn = $idServiceProductOrderDetail ? self::SCOPE_COLUMN_SERVICE : self::SCOPE_COLUMN_ROOM;
+ $scopeValue = $idServiceProductOrderDetail ?: $idHtlBooking;
+
+ self::deleteTourismRowsForScope($scopeColumn, $scopeValue);
+
+ foreach ($taxAmounts as $idTax => $rowAmount) {
+ $rowAmount = (float) $rowAmount;
+
+ $tourismTax = TaxConfiguration::getByTaxId((int) $idTax);
+ $divisor = ($tourismTax && $tourismTax->per_night)
+ ? max(1, (int) ($validNightsByTax[$idTax] ?? $numNights))
+ : max(1, (int) $quantity);
+
+ $taxRow = new OrderTaxDetail();
+ $taxRow->id_order = $idOrder;
+ $taxRow->id_order_detail = $idOrderDetail;
+ $taxRow->id_htl_booking = $idHtlBooking;
+ $taxRow->id_service_product_order_detail = $idServiceProductOrderDetail;
+ $taxRow->id_tax = (int) $idTax;
+ $taxRow->unit_amount = Tools::ps_round($rowAmount / $divisor, 6);
+ $taxRow->total_amount = $rowAmount;
+ $taxRow->add();
+ }
+
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_detail`
+ SET `id_tourism_tax_rule_group` = ' . $idTaxRulesGroup . '
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+
+ self::recomputeInclusivePrice($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail);
+ }
+
+ /**
+ * Sum of VAT + tourism tax rows (exemption-aware) for one scope value of one order_tax_detail column.
+ *
+ * @param string $scopeColumn e.g. 'id_order_detail', self::SCOPE_COLUMN_ROOM, self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return float
+ */
+ private static function computeScopedTaxSum($scopeColumn, $scopeValue)
+ {
+ return (float) Db::getInstance()->getValue(
+ 'SELECT COALESCE(SUM(
+ CASE WHEN t.`is_tourism_tax` = 1 AND ex.`id_order_tax_exemption` IS NOT NULL THEN 0
+ ELSE ott.`total_amount`
+ END
+ ), 0)
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax`
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE ott.`' . bqSQL($scopeColumn) . '` = ' . (int) $scopeValue
+ );
+ }
+
+ /**
+ * A WITH_ROOM auto-add service line's own VAT never gets an order_tax_detail row (it's baked into
+ * the room's price via room-rate substitution instead — see saveTaxCalculator()'s WITH_ROOM skip).
+ * This reconstructs that "phantom" VAT for one service instance so its own inclusive total is complete.
+ *
+ * @param array $serviceRow id_product, id_htl_booking_detail, total_price_tax_excl from service_product_order_detail
+ * @param int $idOrder
+ * @return float
+ */
+ private static function computePhantomVatForServiceLine(array $serviceRow, $idOrder)
+ {
+ if (!$serviceRow['id_htl_booking_detail']) {
+ return 0.0;
+ }
+
+ $roomBooking = new HotelBookingDetail((int) $serviceRow['id_htl_booking_detail']);
+ if (!Validate::isLoadedObject($roomBooking)) {
+ return 0.0;
+ }
+
+ $priceInfo = RoomTypeServiceProductPrice::getProductRoomTypePriceAndTax(
+ (int) $serviceRow['id_product'],
+ (int) $roomBooking->id_product,
+ RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE
+ );
+ if (!$priceInfo || !isset($priceInfo['id_tax_rules_group'])) {
+ return 0.0;
+ }
+
+ $order = new Order((int) $idOrder);
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType(
+ (int) $roomBooking->id_hotel,
+ new Address((int) $order->id_address_tax)
+ );
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return 0.0;
+ }
+
+ $totalPriceTaxExcl = (float) $serviceRow['total_price_tax_excl'];
+ $taxCalculator = TaxManagerFactory::getManager($address, (int) $priceInfo['id_tax_rules_group'])->getTaxCalculator();
+
+ return $taxCalculator->addTaxes($totalPriceTaxExcl) - $totalPriceTaxExcl;
+ }
+
+ /**
+ * A room booking's own tax-inclusive total: its own price plus only ITS OWN order_tax_detail rows
+ * (scoped by id_htl_booking) — never another booking's, even when several bookings of the same
+ * room type share one order_detail row (same product, different date ranges).
+ *
+ * @param int $idHtlBooking
+ * @return float
+ */
+ private static function computeRoomBookingInclusivePrice($idHtlBooking)
+ {
+ $totalPriceTaxExcl = (float) Db::getInstance()->getValue(
+ 'SELECT `total_price_tax_excl` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . (int) $idHtlBooking
+ );
+
+ return $totalPriceTaxExcl + self::computeScopedTaxSum(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ }
+
+ /**
+ * A service line instance's own tax-inclusive total: its own price plus only ITS OWN order_tax_detail
+ * rows (scoped by id_service_product_order_detail) plus its own phantom VAT share if WITH_ROOM auto-add
+ * — never another instance's, even when several instances of the same service share one order_detail row.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param array $orderDetailRow product_auto_add, product_price_addition_type, id_order (shared by all
+ * instances under this order_detail, since they're all the same product)
+ * @return float
+ */
+ private static function computeServiceLineInclusivePrice($idServiceProductOrderDetail, array $orderDetailRow)
+ {
+ $serviceRow = Db::getInstance()->getRow(
+ 'SELECT `total_price_tax_excl`, `id_product`, `id_htl_booking_detail`
+ FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . (int) $idServiceProductOrderDetail
+ );
+ $totalPriceTaxExcl = (float) $serviceRow['total_price_tax_excl'];
+
+ $phantomVat = 0.0;
+ if ($orderDetailRow['product_auto_add']
+ && (int) $orderDetailRow['product_price_addition_type'] === Product::PRICE_ADDITION_TYPE_WITH_ROOM
+ ) {
+ $phantomVat = self::computePhantomVatForServiceLine($serviceRow, (int) $orderDetailRow['id_order']);
+ }
+
+ return $totalPriceTaxExcl + self::computeScopedTaxSum(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail) + $phantomVat;
+ }
+
+ /**
+ *
+ * @param int $idOrderDetail
+ * @param int $idHtlBooking unused; kept for call-site compatibility
+ * @param int $idServiceProductOrderDetail unused; kept for call-site compatibility
+ * @return bool
+ */
+ protected static function recomputeInclusivePrice($idOrderDetail, $idHtlBooking, $idServiceProductOrderDetail)
+ {
+ $idOrderDetail = (int) $idOrderDetail;
+ $db = Db::getInstance();
+
+ $orderDetailRow = $db->getRow(
+ 'SELECT `product_quantity`, `product_auto_add`, `product_price_addition_type`, `id_order`
+ FROM `' . _DB_PREFIX_ . 'order_detail`
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+
+ $result = true;
+ $aggregateTaxIncl = 0.0;
+
+ $roomIds = $db->executeS(
+ 'SELECT `id` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($roomIds as $row) {
+ $roomTaxIncl = self::computeRoomBookingInclusivePrice((int) $row['id']);
+ $aggregateTaxIncl += $roomTaxIncl;
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'htl_booking_detail`
+ SET `total_price_tax_incl` = ' . $roomTaxIncl . '
+ WHERE `id` = ' . (int) $row['id']
+ ) && $result;
+ }
+
+ $serviceIds = $db->executeS(
+ 'SELECT `id_service_product_order_detail`, `quantity`
+ FROM `' . _DB_PREFIX_ . 'service_product_order_detail` WHERE `id_order_detail` = ' . $idOrderDetail
+ );
+ foreach ($serviceIds as $row) {
+ $serviceTaxIncl = self::computeServiceLineInclusivePrice((int) $row['id_service_product_order_detail'], $orderDetailRow);
+ $aggregateTaxIncl += $serviceTaxIncl;
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'service_product_order_detail`
+ SET `total_price_tax_incl` = ' . $serviceTaxIncl . ',
+ `unit_price_tax_incl` = COALESCE(' . $serviceTaxIncl . ' / NULLIF(' . (int) $row['quantity'] . ', 0), 0)
+ WHERE `id_service_product_order_detail` = ' . (int) $row['id_service_product_order_detail']
+ ) && $result;
+ }
+
+ $result = $db->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_detail`
+ SET `total_price_tax_incl` = ' . $aggregateTaxIncl . ',
+ `unit_price_tax_incl` = COALESCE(' . $aggregateTaxIncl . ' / NULLIF(`product_quantity`, 0), 0)
+ WHERE `id_order_detail` = ' . $idOrderDetail
+ ) && $result;
+
+ return $result;
+ }
+
+ /**
+ * Breakdown for invoice/PDF — grouped by id_tax, excluding exempted (via marker) or refunded rows, cached per order+lang.
+ *
+ * @param int $idOrder
+ * @param int|null $idLang defaults to the current context language
+ * @return array
+ */
+ public static function getBreakdownForInvoice($idOrder, $idLang = null)
+ {
+ $idOrder = (int) $idOrder;
+ $idLang = $idLang !== null ? (int) $idLang : (int) Context::getContext()->language->id;
+ $cacheId = 'OrderTaxDetail::getBreakdownForInvoice-' . $idOrder . '-' . $idLang;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $result = Db::getInstance()->executeS(
+ 'SELECT ott.`id_tax`, tl.`name` AS tax_name,
+ SUM(ott.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = ott.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ LEFT JOIN `' . _DB_PREFIX_ . 'tax_lang` tl
+ ON tl.`id_tax` = ott.`id_tax` AND tl.`id_lang` = ' . $idLang . '
+ WHERE ott.`id_order` = ' . $idOrder . '
+ AND ((ott.`id_htl_booking` != 0 AND hbd.`is_refunded` = 0)
+ OR (ott.`id_htl_booking` = 0 AND spod.`is_refunded` = 0))
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY ott.`id_tax`, tl.`name`'
+ );
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Applied (non-exempted, non-refunded) tourism tax total per order_detail line. Same
+ * exemption/refund-aware join as getBreakdownForInvoice(), grouped by id_order_detail instead of
+ * id_tax.
+ *
+ * @param int $idOrder
+ * @return array [id_order_detail => total_amount]
+ */
+ public static function getAmountsByOrderDetail($idOrder)
+ {
+ $idOrder = (int) $idOrder;
+ $cacheId = 'OrderTaxDetail::getAmountsByOrderDetail-' . $idOrder;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $rows = Db::getInstance()->executeS(
+ 'SELECT ott.`id_order_detail`, SUM(ott.`total_amount`) AS total_amount
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` ott
+ INNER JOIN `' . _DB_PREFIX_ . 'tax` t ON t.`id_tax` = ott.`id_tax` AND t.`is_tourism_tax` = 1
+ LEFT JOIN `' . _DB_PREFIX_ . 'service_product_order_detail` spod
+ ON spod.`id_service_product_order_detail` = ott.`id_service_product_order_detail`
+ LEFT JOIN `' . _DB_PREFIX_ . 'htl_booking_detail` hbd
+ ON hbd.`id` = ott.`id_htl_booking`
+ LEFT JOIN `' . _DB_PREFIX_ . 'order_tax_exemption` ex
+ ON (ott.`id_htl_booking` != 0 AND ex.`id_htl_booking` = ott.`id_htl_booking`)
+ OR (ott.`id_htl_booking` = 0 AND spod.`id_htl_booking_detail` != 0 AND ex.`id_htl_booking` = spod.`id_htl_booking_detail`)
+ OR (ott.`id_htl_booking` = 0 AND (spod.`id_htl_booking_detail` = 0 OR spod.`id_htl_booking_detail` IS NULL) AND ex.`id_service_product_order_detail` = ott.`id_service_product_order_detail` AND ex.`id_htl_booking` = 0)
+ WHERE ott.`id_order` = ' . $idOrder . '
+ AND ((ott.`id_htl_booking` != 0 AND hbd.`is_refunded` = 0)
+ OR (ott.`id_htl_booking` = 0 AND spod.`is_refunded` = 0))
+ AND ex.`id_order_tax_exemption` IS NULL
+ GROUP BY ott.`id_order_detail`'
+ );
+
+ $result = array();
+ foreach ((array) $rows as $row) {
+ $result[(int) $row['id_order_detail']] = (float) $row['total_amount'];
+ }
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * The single source of truth for an order's tourism tax total — applied, non-exempted, non-refunded.
+ *
+ * @param int $idOrder
+ * @return float
+ */
+ public static function getOrderTourismTaxTotal($idOrder)
+ {
+ return (float) array_sum(array_column(self::getBreakdownForInvoice((int) $idOrder), 'total_amount'));
+ }
+
+ /**
+ * Whether a scope is refunded — apply/exempt must not touch a cancelled booking/service line.
+ * Reads the authoritative flag directly (htl_booking_detail/service_product_order_detail),
+ * not a stored copy on order_tax_detail.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @return bool
+ */
+ protected static function hasRefundedRowsForScope($scopeColumn, $scopeValue)
+ {
+ $scopeValue = (int) $scopeValue;
+ if ($scopeColumn === self::SCOPE_COLUMN_ROOM) {
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT `is_refunded` FROM `' . _DB_PREFIX_ . 'htl_booking_detail` WHERE `id` = ' . $scopeValue
+ );
+ }
+ return (bool) Db::getInstance()->getValue(
+ 'SELECT `is_refunded` FROM `' . _DB_PREFIX_ . 'service_product_order_detail`
+ WHERE `id_service_product_order_detail` = ' . $scopeValue
+ );
+ }
+
+ /**
+ * Resolve every parameter saveTourismTax() needs for an already-placed room booking, from the booking's own hotel (not the order's single id_address_tax column).
+ *
+ * @param int $idHtlBooking
+ * @return array|false Ordered args for self::saveTourismTax(), or false when the
+ * booking/order/TRG/address can't be resolved
+ */
+ public static function buildRoomTaxParams($idHtlBooking)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return false;
+ }
+
+ $order = new Order((int) $booking->id_order);
+ if (!Validate::isLoadedObject($order)) {
+ return false;
+ }
+
+ $idTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $booking->id_product);
+ if (!$idTaxRulesGroup) {
+ return false;
+ }
+
+ $idHotel = (int) $booking->id_hotel;
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, new Address((int) $order->id_address_tax));
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return false;
+ }
+ $collectionType = $hotelContext['collectionType'];
+
+ $numNights = (int) HotelHelper::getNumberOfDays($booking->date_from, $booking->date_to);
+ if ($numNights <= 0) {
+ return false;
+ }
+
+ $unitPriceTaxExcl = Tools::ps_round((float) $booking->total_price_tax_excl / $numNights, 6);
+
+ $childrenAges = array();
+ if ($booking->child_ages) {
+ $decoded = json_decode($booking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+
+ return array(
+ 'idTaxRulesGroup' => $idTaxRulesGroup,
+ 'address' => $address,
+ 'unitPriceTaxExcl' => $unitPriceTaxExcl,
+ 'checkInDate' => $booking->date_from,
+ 'numNights' => $numNights,
+ 'numAdults' => (int) $booking->adults,
+ 'childrenAges' => $childrenAges,
+ 'idCurrency' => (int) $order->id_currency,
+ 'collectionType' => $collectionType,
+ 'idLang' => (int) Context::getContext()->language->id,
+ 'quantity' => 1,
+ 'idOrder' => (int) $booking->id_order,
+ 'idOrderDetail' => (int) $booking->id_order_detail,
+ 'idHtlBooking' => $idHtlBooking,
+ 'idServiceProductOrderDetail' => 0,
+ );
+ }
+
+ /**
+ * Same as buildRoomTaxParams(), for an already-placed service product line.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @return array|false
+ */
+ public static function buildServiceLineTaxParams($idServiceProductOrderDetail)
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ if (!Validate::isLoadedObject($serviceLine)) {
+ return false;
+ }
+
+ $order = new Order((int) $serviceLine->id_order);
+ if (!Validate::isLoadedObject($order)) {
+ return false;
+ }
+
+ $idTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $serviceLine->id_product);
+ if (!$idTaxRulesGroup) {
+ return false;
+ }
+
+ $idHotel = (int) $serviceLine->id_hotel;
+ $hotelContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, new Address((int) $order->id_address_tax));
+ $address = $hotelContext['address'];
+ if (!Validate::isLoadedObject($address)) {
+ return false;
+ }
+ $collectionType = $hotelContext['collectionType'];
+
+ $idHtlBookingDetail = (int) $serviceLine->id_htl_booking_detail;
+ $roomBooking = $idHtlBookingDetail ? new HotelBookingDetail($idHtlBookingDetail) : null;
+ if ($roomBooking && Validate::isLoadedObject($roomBooking)) {
+ $checkInDate = $roomBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($roomBooking->date_from, $roomBooking->date_to));
+ $numAdults = (int) $roomBooking->adults;
+ $childrenAges = array();
+ if ($roomBooking->child_ages) {
+ $decoded = json_decode($roomBooking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+ } else {
+ $checkInDate = date('Y-m-d');
+ $numNights = 1;
+ $numAdults = 1;
+ $childrenAges = array();
+ }
+
+ return array(
+ 'idTaxRulesGroup' => $idTaxRulesGroup,
+ 'address' => $address,
+ 'unitPriceTaxExcl' => (float) $serviceLine->unit_price_tax_excl,
+ 'checkInDate' => $checkInDate,
+ 'numNights' => $numNights,
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges,
+ 'idCurrency' => (int) $order->id_currency,
+ 'collectionType' => $collectionType,
+ 'idLang' => (int) Context::getContext()->language->id,
+ 'quantity' => (int) $serviceLine->quantity,
+ 'idOrder' => (int) $serviceLine->id_order,
+ 'idOrderDetail' => (int) $serviceLine->id_order_detail,
+ 'idHtlBooking' => 0,
+ 'idServiceProductOrderDetail' => $idServiceProductOrderDetail,
+ );
+ }
+
+ /**
+ * Call saveTourismTax() with a buildRoomTaxParams()/buildServiceLineTaxParams() result.
+ *
+ * @param array $params
+ * @return void
+ */
+ protected static function saveTourismTaxFromParams(array $params)
+ {
+ self::saveTourismTax(
+ $params['idTaxRulesGroup'],
+ $params['address'],
+ $params['unitPriceTaxExcl'],
+ $params['checkInDate'],
+ $params['numNights'],
+ $params['numAdults'],
+ $params['childrenAges'],
+ $params['idCurrency'],
+ $params['collectionType'],
+ $params['idLang'],
+ $params['quantity'],
+ $params['idOrder'],
+ $params['idOrderDetail'],
+ $params['idHtlBooking'],
+ $params['idServiceProductOrderDetail']
+ );
+ }
+
+ /**
+ *
+ * @param int $idOrder
+ * @param int $idEmployee
+ * @param string $autoMsg
+ * @param string|null $note Optional remark appended as "| {$remarkLabel}: ..." — omit for apply actions
+ * @param string $remarkLabel Pre-translated "Remark" label
+ */
+ protected static function saveTourismTaxNote($idOrder, $idEmployee, $autoMsg, $note = null, $remarkLabel = 'Remark')
+ {
+ $noteMessage = $autoMsg . ($note && Validate::isMessage($note) ? ' | ' . $remarkLabel . ': ' . $note : '');
+ $message = new Message();
+ $message->message = $noteMessage;
+ $message->id_order = (int) $idOrder;
+ $message->id_employee = (int) $idEmployee;
+ $message->private = 1;
+ $message->save();
+ }
+
+ /**
+ * Exempt a booking's tourism tax — one marker row covers the room and every service attached to
+ * it. Idempotent: exempting an already-exempted booking is a no-op success.
+ *
+ * @param int $idHtlBooking
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $note Reason for exemption, entered by the employee
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return int EXEMPT_OK | EXEMPT_ERROR_NO_RULE | EXEMPT_ERROR_SAVE
+ */
+ public static function exemptBooking($idHtlBooking, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ if (self::isBookingExempted($idHtlBooking)) {
+ return self::EXEMPT_OK;
+ }
+
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return self::EXEMPT_ERROR_NO_RULE;
+ }
+
+ $objOrderTaxExemption = new OrderTaxExemption();
+ $objOrderTaxExemption->id_htl_booking = $idHtlBooking;
+ $objOrderTaxExemption->id_service_product_order_detail = 0;
+ $objOrderTaxExemption->id_order = (int) $booking->id_order;
+ $objOrderTaxExemption->id_employee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $objOrderTaxExemption->note = $note;
+ if (!$objOrderTaxExemption->add()) {
+ return self::EXEMPT_ERROR_SAVE;
+ }
+
+ if ($autoMsgLabel !== null) {
+ $roomTypeName = Product::getProductName((int) $booking->id_product, null, Context::getContext()->language->id);
+ $autoMsg = $autoMsgLabel . ': ' . $booking->room_num . ' - ' . $roomTypeName . ': ('
+ . date('d/m/Y', strtotime($booking->date_from)) . ' - ' . date('d/m/Y', strtotime($booking->date_to)) . ')';
+ self::saveTourismTaxNote((int) $booking->id_order, $objOrderTaxExemption->id_employee, $autoMsg, $note, $remarkLabel);
+ }
+
+ self::syncDenormalizedTotalsForBooking($idHtlBooking, false);
+
+ return self::EXEMPT_OK;
+ }
+
+ /**
+ * Apply (or re-apply) tourism tax for a booking — deletes the exemption marker if one exists,
+ * restoring the room + every attached service's tax into the denormalized display totals. If
+ * nothing has ever been computed for the room and/or a given service line (e.g. config was off
+ * at order time), computes it fresh instead.
+ *
+ * @param int $idHtlBooking
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely
+ * @return int APPLY_OK | APPLY_ERROR_RESTORE | APPLY_ERROR_NOT_APPLICABLE
+ */
+ public static function applyBooking($idHtlBooking, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ $wasExempted = self::isBookingExempted($idHtlBooking);
+ $changed = $wasExempted;
+ if ($wasExempted) {
+ if (!self::deleteExemptionMarker($idHtlBooking, 0)) {
+ return self::APPLY_ERROR_RESTORE;
+ }
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ }
+
+ if (self::hasNeverBeenComputed(self::SCOPE_COLUMN_ROOM, $idHtlBooking)) {
+ $params = self::buildRoomTaxParams($idHtlBooking);
+ if ($params) {
+ $params['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($params);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_ROOM, $idHtlBooking, $params['idOrder']);
+ }
+ }
+ }
+
+ $idServiceLines = ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHtlBooking);
+ foreach ($idServiceLines as $idServiceLine) {
+ if ($wasExempted) {
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_SERVICE, $idServiceLine);
+ }
+ if (!self::hasNeverBeenComputed(self::SCOPE_COLUMN_SERVICE, $idServiceLine)) {
+ continue;
+ }
+ $svcParams = self::buildServiceLineTaxParams($idServiceLine);
+ if ($svcParams) {
+ $svcParams['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($svcParams);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_SERVICE, $idServiceLine, $svcParams['idOrder']);
+ }
+ }
+ }
+
+ if ($wasExempted) {
+ self::syncDenormalizedTotalsForBooking($idHtlBooking, true);
+ }
+
+ $hasAnyTourismTax = self::getScopedTotal(self::SCOPE_COLUMN_ROOM, $idHtlBooking) > 0;
+ foreach ($idServiceLines as $idServiceLine) {
+ if ($hasAnyTourismTax) {
+ break;
+ }
+ $hasAnyTourismTax = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceLine) > 0;
+ }
+ if (!$hasAnyTourismTax) {
+ return self::APPLY_ERROR_NOT_APPLICABLE;
+ }
+
+ if ($autoMsgLabel !== null && $changed) {
+ $idEmployee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $roomTypeName = Product::getProductName((int) $booking->id_product, null, Context::getContext()->language->id);
+ $autoMsg = $autoMsgLabel . ': ' . $booking->room_num . ' - ' . $roomTypeName . ': ('
+ . date('d/m/Y', strtotime($booking->date_from)) . ' - ' . date('d/m/Y', strtotime($booking->date_to)) . ')';
+ self::saveTourismTaxNote((int) $booking->id_order, $idEmployee, $autoMsg);
+ }
+
+ return self::APPLY_OK;
+ }
+
+ /**
+ * Exempt a single standalone (no room attachment) service line directly — the one case a
+ * booking-level marker can't cover, since there's no booking to attach it to.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param int $idEmployee
+ * @param string|null $note
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label — null skips the Order Notes entry entirely
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return int EXEMPT_OK | EXEMPT_ERROR_NO_RULE | EXEMPT_ERROR_SAVE
+ */
+ public static function exemptServiceLine($idServiceProductOrderDetail, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ if (self::isServiceLineExempted($idServiceProductOrderDetail)) {
+ return self::EXEMPT_OK;
+ }
+
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ if (!Validate::isLoadedObject($serviceLine) || $serviceLine->id_htl_booking_detail) {
+ return self::EXEMPT_ERROR_NO_RULE;
+ }
+
+ $objOrderTaxExemption = new OrderTaxExemption();
+ $objOrderTaxExemption->id_htl_booking = 0;
+ $objOrderTaxExemption->id_service_product_order_detail = $idServiceProductOrderDetail;
+ $objOrderTaxExemption->id_order = (int) $serviceLine->id_order;
+ $objOrderTaxExemption->id_employee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $objOrderTaxExemption->note = $note;
+ if (!$objOrderTaxExemption->add()) {
+ return self::EXEMPT_ERROR_SAVE;
+ }
+
+ if ($autoMsgLabel !== null) {
+ $autoMsg = $autoMsgLabel . ': ' . $serviceLine->name;
+ self::saveTourismTaxNote((int) $serviceLine->id_order, $objOrderTaxExemption->id_employee, $autoMsg, $note, $remarkLabel);
+ }
+
+ $total = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ if ($total) {
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceProductOrderDetail);
+ self::adjustOrderAndInvoiceTotals((int) $serviceLine->id_order, -$total);
+ }
+
+ return self::EXEMPT_OK;
+ }
+
+ /**
+ * Apply (or re-apply) tourism tax for a single standalone service line.
+ *
+ * @param int $idServiceProductOrderDetail
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely
+ * @return int APPLY_OK | APPLY_ERROR_RESTORE | APPLY_ERROR_NOT_APPLICABLE
+ */
+ public static function applyServiceLine($idServiceProductOrderDetail, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idServiceProductOrderDetail = (int) $idServiceProductOrderDetail;
+ $serviceLine = new ServiceProductOrderDetail($idServiceProductOrderDetail);
+ $wasExempted = self::isServiceLineExempted($idServiceProductOrderDetail);
+ $changed = $wasExempted;
+ if ($wasExempted) {
+ if (!self::deleteExemptionMarker(0, $idServiceProductOrderDetail)) {
+ return self::APPLY_ERROR_RESTORE;
+ }
+ self::deleteTourismRowsForScope(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ }
+
+ if (self::hasNeverBeenComputed(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail)) {
+ $params = self::buildServiceLineTaxParams($idServiceProductOrderDetail);
+ if ($params) {
+ $params['collectionType'] = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ self::saveTourismTaxFromParams($params);
+ $changed = true;
+ if (!$wasExempted) {
+ self::adjustOrderTotalsForNewRows(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail, $params['idOrder']);
+ }
+ }
+ }
+
+ if ($wasExempted) {
+ $total = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail);
+ if ($total && Validate::isLoadedObject($serviceLine)) {
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceProductOrderDetail);
+ self::adjustOrderAndInvoiceTotals((int) $serviceLine->id_order, $total);
+ }
+ }
+
+ if (self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceProductOrderDetail) <= 0) {
+ return self::APPLY_ERROR_NOT_APPLICABLE;
+ }
+
+ if ($autoMsgLabel !== null && $changed) {
+ $idEmployee = $idEmployee ? (int) $idEmployee : (int) Context::getContext()->employee->id;
+ $autoMsg = $autoMsgLabel . ': ' . $serviceLine->name;
+ self::saveTourismTaxNote((int) $serviceLine->id_order, $idEmployee, $autoMsg);
+ }
+
+ return self::APPLY_OK;
+ }
+
+ /**
+ * Exempt tourism tax for every booking (room + attached services) and every standalone service line
+ * of an order; returns only the failing entries.
+ *
+ * @param int $idOrder
+ * @param int $idEmployee
+ * @param string|null $note Reason for exemption, applied to every booking/line in the order
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Exempted" label — null skips the Order Notes entry entirely, for every booking/line in the order
+ * @param string $remarkLabel Pre-translated "Remark" label
+ * @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
+ * [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
+ */
+ public static function exemptForOrder($idOrder, $idEmployee = 0, $note = null, $autoMsgLabel = null, $remarkLabel = 'Remark')
+ {
+ $idOrder = (int) $idOrder;
+ $failures = array();
+ $objBookingDetail = new HotelBookingDetail();
+ $bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
+ if ($bookings) {
+ foreach ($bookings as $booking) {
+ if (!empty($booking['is_refunded']) || !empty($booking['is_cancelled'])) {
+ continue;
+ }
+ $result = self::exemptBooking($booking['id'], $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if ($result !== self::EXEMPT_OK) {
+ $failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
+ }
+ }
+ }
+ foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ $result = self::exemptServiceLine($idServiceLine, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if ($result !== self::EXEMPT_OK) {
+ $failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
+ }
+ }
+ return $failures;
+ }
+
+ /**
+ * Apply tourism tax for every booking and every standalone service line of an order; returns only
+ * the failing entries. A booking/line with nothing applicable (neither the room nor any attached
+ * service, or the standalone line itself, has a tourism tax rule) is not a failure — it's silently
+ * skipped, same as if it had simply been left alone.
+ *
+ * @param int $idOrder
+ * @param int $idEmployee PS employee id (0 = resolved from Context)
+ * @param string|null $autoMsgLabel Pre-translated "Tourism Tax Applied" label — null skips the Order Notes entry entirely, for every booking/line in the order
+ * @return array [{'id_htl_booking' => int, 'result' => int}, ...] plus
+ * [{'id_service_product_order_detail' => int, 'result' => int}, ...] — failures only
+ */
+ public static function applyForOrder($idOrder, $idEmployee = 0, $autoMsgLabel = null)
+ {
+ $idOrder = (int) $idOrder;
+ $failures = array();
+ $objBookingDetail = new HotelBookingDetail();
+ $bookings = $objBookingDetail->getBookingDataByOrderId($idOrder);
+ if ($bookings) {
+ foreach ($bookings as $booking) {
+ if (!empty($booking['is_refunded']) || !empty($booking['is_cancelled'])) {
+ continue;
+ }
+ $result = self::applyBooking($booking['id'], $idEmployee, $autoMsgLabel);
+ if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
+ $failures[] = array('id_htl_booking' => (int) $booking['id'], 'result' => $result);
+ }
+ }
+ }
+ foreach (ServiceProductOrderDetail::getActiveStandaloneIdsByOrder($idOrder) as $idServiceLine) {
+ $result = self::applyServiceLine($idServiceLine, $idEmployee, $autoMsgLabel);
+ if ($result !== self::APPLY_OK && $result !== self::APPLY_ERROR_NOT_APPLICABLE) {
+ $failures[] = array('id_service_product_order_detail' => $idServiceLine, 'result' => $result);
+ }
+ }
+ return $failures;
+ }
+
+ /**
+ * After fresh-computing tourism tax for a scope that had no prior rows (e.g. config was off at
+ * order time), fold the newly-applied total into the order's own totals — recomputeInclusivePrice()
+ * (called inside saveTourismTax()) only syncs order_detail/htl_booking_detail/service_product_order_detail,
+ * never orders/order_invoice.
+ *
+ * @param string $scopeColumn self::SCOPE_COLUMN_ROOM or self::SCOPE_COLUMN_SERVICE
+ * @param int $scopeValue
+ * @param int $idOrder
+ * @return void
+ */
+ protected static function adjustOrderTotalsForNewRows($scopeColumn, $scopeValue, $idOrder)
+ {
+ $appliedTotal = self::getScopedTotal($scopeColumn, $scopeValue);
+ self::adjustOrderAndInvoiceTotals($idOrder, $appliedTotal);
+ }
+
+ /**
+ * Sum the room's own tax + every attached service line's tax and apply that whole delta once —
+ * used on exemptBooking()/applyBooking() to move the booking's tourism tax in or out of the
+ * denormalized display totals in one pass, rather than per-row.
+ *
+ * @param int $idHtlBooking
+ * @param bool $nowIncluded true = restoring (apply), false = removing (exempt)
+ * @return void
+ */
+ protected static function syncDenormalizedTotalsForBooking($idHtlBooking, $nowIncluded)
+ {
+ $idHtlBooking = (int) $idHtlBooking;
+ $booking = new HotelBookingDetail($idHtlBooking);
+ if (!Validate::isLoadedObject($booking)) {
+ return;
+ }
+ $totalDelta = 0.0;
+
+ $roomTotal = self::getScopedTotal(self::SCOPE_COLUMN_ROOM, $idHtlBooking);
+ if ($roomTotal) {
+ $prev = $nowIncluded ? 0.0 : $roomTotal;
+ $new = $nowIncluded ? $roomTotal : 0.0;
+ self::recomputeInclusivePrice((int) $booking->id_order_detail, $idHtlBooking, 0);
+ $totalDelta += ($new - $prev);
+ }
+
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHtlBooking) as $idServiceLine) {
+ $serviceTotal = self::getScopedTotal(self::SCOPE_COLUMN_SERVICE, $idServiceLine);
+ if (!$serviceTotal) {
+ continue;
+ }
+ $serviceLine = new ServiceProductOrderDetail($idServiceLine);
+ if (!Validate::isLoadedObject($serviceLine)) {
+ continue;
+ }
+ $prev = $nowIncluded ? 0.0 : $serviceTotal;
+ $new = $nowIncluded ? $serviceTotal : 0.0;
+ self::recomputeInclusivePrice((int) $serviceLine->id_order_detail, 0, $idServiceLine);
+ $totalDelta += ($new - $prev);
+ }
+
+ self::adjustOrderAndInvoiceTotals((int) $booking->id_order, $totalDelta);
+ }
+
+ /**
+ * Apply an applied-tourism-tax delta to both the order's own totals and every invoice already generated for it.
+ *
+ * @param int $idOrder
+ * @param float $delta Signed — positive when restoring/adding tax, negative when exempting it
+ */
+ protected static function adjustOrderAndInvoiceTotals($idOrder, $delta)
+ {
+ $delta = (float) $delta;
+ if (!$delta) {
+ return;
+ }
+
+ $idOrder = (int) $idOrder;
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'orders`
+ SET `total_paid_tax_incl` = GREATEST(0, `total_paid_tax_incl` + ' . $delta . '),
+ `total_paid_tax_excl` = GREATEST(0, `total_paid_tax_excl` + ' . $delta . '),
+ `total_paid` = GREATEST(0, `total_paid` + ' . $delta . ')
+ WHERE `id_order` = ' . $idOrder
+ );
+ Db::getInstance()->execute(
+ 'UPDATE `' . _DB_PREFIX_ . 'order_invoice`
+ SET `total_paid_tax_incl` = GREATEST(0, `total_paid_tax_incl` + ' . $delta . '),
+ `total_paid_tax_excl` = GREATEST(0, `total_paid_tax_excl` + ' . $delta . ')
+ WHERE `id_order` = ' . $idOrder
+ );
+ }
+}
\ No newline at end of file
diff --git a/classes/order/OrderTaxExemption.php b/classes/order/OrderTaxExemption.php
new file mode 100644
index 000000000..dbbac21c3
--- /dev/null
+++ b/classes/order/OrderTaxExemption.php
@@ -0,0 +1,46 @@
+ 'order_tax_exemption',
+ 'primary' => 'id_order_tax_exemption',
+ 'fields' => array(
+ 'id_htl_booking' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_service_product_order_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+ 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'id_employee' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'note' => array('type' => self::TYPE_STRING, 'validate' => 'isMessage', 'allow_null' => true),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ ),
+ );
+}
diff --git a/classes/pdf/HTMLTemplateBookingVoucher.php b/classes/pdf/HTMLTemplateBookingVoucher.php
index c4e5d17df..890a5772d 100644
--- a/classes/pdf/HTMLTemplateBookingVoucher.php
+++ b/classes/pdf/HTMLTemplateBookingVoucher.php
@@ -159,17 +159,6 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
// Services for this booking
$bookingServices = array();
- $objBookingDemand = new HotelBookingDemands();
- $extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 0, 0, 0,
- (int)$booking['id'], (int)$booking['id_order_detail']
- );
- if (is_array($extraDemands)) {
- foreach ($extraDemands as $demand) {
- $bookingServices[] = array('name' => $demand['name'], 'quantity' => 1);
- }
- }
-
// Auto-added services bundled with room price (for cost calculation only)
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$autoAddedWithRoomPriceTaxExcl = (float)$objServiceProductOrderDetail->getRoomTypeServiceProducts(
@@ -181,7 +170,7 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
1, 0, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM
);
- // Additional services chosen by guest
+ // Extra services chosen by guest
$additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0, 0, 0, 0, 0, 0, 0, 0, 1, 0, null, 0, (int)$booking['id']
);
@@ -274,13 +263,10 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
}
}
// --- Totals ---
- $objBookingDemand = new HotelBookingDemands();
- $totalDemandsPriceTE = (float)$objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 1, 1, 0
- );
- $totalDemandsPriceTI = (float)$objBookingDemand->getRoomTypeBookingExtraDemands(
- (int)$this->order->id, 0, 0, 0, 0, 1, 1, 1
- );
+ // Extra demands feature was removed from the system; kept as 0 so the
+ // additive totals below stay correct without the deleted HotelBookingDemands class.
+ $totalDemandsPriceTE = 0;
+ $totalDemandsPriceTI = 0;
$orderDetails = OrderDetail::getList((int)$this->order->id);
$idsOrderDetail = is_array($orderDetails)
@@ -321,7 +307,9 @@ class HTMLTemplateBookingVoucherCore extends HTMLTemplate
$footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'] + $footer['service_products_price_tax_excl'];
$totalWithoutDiscountTaxIncl = $roomsCostTaxIncl + $serviceProductsCostTaxIncl + $additionalServicesCostTaxIncl + $convenienceFeeTaxIncl;
- $footer['total_tax_without_discount'] = max(0, $totalWithoutDiscountTaxIncl - $footer['total_without_discount_te']);
+ $totalTourismTax = OrderTaxDetail::getOrderTourismTaxTotal((int) $this->order->id);
+ $footer['total_tax_without_discount'] = max(0, $totalWithoutDiscountTaxIncl - $footer['total_without_discount_te'] - $totalTourismTax);
+ $footer['total_tourism_tax'] = $totalTourismTax;
$grandTotal = max(0.0, $totalWithoutDiscountTaxIncl - $productDiscountsTaxIncl);
$footer['product_discounts_tax_incl'] = $productDiscountsTaxIncl;
$footer['total_paid_tax_incl'] = $grandTotal;
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index e5b36b518..514b001d4 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -312,7 +312,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$cart_htl_data = array();
$service_product_data = array();
- $room_extra_demands = array();
$room_additinal_services = array();
$formattedHotelAddress = '';
if (Module::isInstalled('hotelreservationsystem')) {
@@ -335,8 +334,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
if (!empty($order_details)) {
$processed_product = array();
- $totalDemandsPriceTE = 0;
- $totalDemandsPriceTI = 0;
foreach ($order_details as $type_key => $type_value) {
$processProductKey = $type_value['product_id'].'_'.$type_value['selling_preference_type'].'_'.$type_value['id_order_detail'];
if (isset($processed_product[$processProductKey])) {
@@ -360,9 +357,32 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, 0, $type_value['product_id'], $idCustomer, $type_value['id_order_detail']);
$cart_htl_data[$type_key]['id_product'] = $type_value['product_id'];
- $objBookingDemand = new HotelBookingDemands();
foreach ($order_bk_data as $data_k => $data_v) {
- $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']);
+ $display_date_from = $data_v['date_from'];
+ $display_date_to = $data_v['date_to'];
+ if ($data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_OUT) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out']) {
+ $display_date_to = $data_v['check_out'];
+ }
+ } elseif ($data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_IN) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ } else {
+ if ($data_v['check_in_time']) {
+ $display_date_from = date('Y-m-d', strtotime($data_v['date_from'])) . ' ' . date('H:i:s', strtotime($data_v['check_in_time']));
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ }
+ $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']).strtotime($display_date_from).strtotime($display_date_to);
/*Product price when order was created*/
$order_details_obj = new OrderDetail($data_v['id_order_detail']);
@@ -386,30 +406,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
// For order refund
$cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room'];
} else {
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0,
- 0,
- $type_value['id_order_detail']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1,
- 0,
- $type_value['id_order_detail']
- );
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order_obj->id,
0,
@@ -473,31 +469,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$num_days = HotelHelper::getNumberOfDays($data_v['date_from'], $data_v['date_to']);
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
- $fullDate = (isset($context->controller->show_full_date) && $context->controller->show_full_date && (date('Y-m-d', strtotime($data_v['date_from'])) == date('Y-m-d', strtotime($data_v['date_to'])))) ? true : false;
- $display_date_from = $data_v['date_from'];
- $display_date_to = $data_v['date_to'];
- if ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_OUT) {
- if ($data_v['check_in']) {
- $display_date_from = $data_v['check_in'];
- }
- if ($data_v['check_out']) {
- $display_date_to = $data_v['check_out'];
- }
- } elseif ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_IN) {
- if ($data_v['check_in']) {
- $display_date_from = $data_v['check_in'];
- }
- if ($data_v['check_out_time']) {
- $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
- }
- } else {
- if ($data_v['check_in_time']) {
- $display_date_from = date('Y-m-d', strtotime($data_v['date_from'])) . ' ' . date('H:i:s', strtotime($data_v['check_in_time']));
- }
- if ($data_v['check_out_time']) {
- $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
- }
- }
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($display_date_from, null, true);
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($display_date_to, null, true);
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days;
@@ -514,32 +485,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room'];
}
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0,
- $data_v['id']
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1,
- $data_v['id']
- );
-
- $totalDemandsPriceTE += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'];
- $totalDemandsPriceTI += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'];
-
$cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_excl'] += $data_v['total_price_tax_excl'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_incl'] += $data_v['total_price_tax_incl'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objServiceProductOrderDetail->getroomTypeServiceProducts(
@@ -569,25 +514,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
Product::PRICE_ADDITION_TYPE_WITH_ROOM
);
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order_obj->id,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 1,
- 0,
- 1,
- $data_v['id']
- )) {
- $extraDemands = array_shift($extraDemands);
- $extraDemands['product_id'] = $type_value['product_id'];
- $extraDemands['room_type_name'] = $type_value['product_name'];
- $extraDemands['date_from'] = $data_v['date_from'];
- $extraDemands['date_to'] = $data_v['date_to'];
- $room_extra_demands[] = $extraDemands;
- }
-
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -657,10 +583,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
}
unset($tax_temp);
-
- // enter extra demands price to the footer total details
- $footer['total_extra_demands_ti'] = $totalDemandsPriceTI;
- $footer['total_extra_demands_te'] = $totalDemandsPriceTE;
}
}
@@ -677,8 +599,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
$footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
$footer['service_products_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
- $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE;
- $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI;
+ $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail);
+ $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail);
$footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
$footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
}
@@ -687,7 +609,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$footer['total_without_discount_te'] = $footer['room_price_tax_excl'] + $footer['total_convenience_fee_te'] + $footer['additional_service_price_tax_excl'] + $footer['service_products_price_tax_excl'];
$footer['total_without_discount_ti'] = $footer['room_price_tax_incl'] + $footer['total_convenience_fee_ti'] + $footer['additional_service_price_tax_incl'] + $footer['service_products_price_tax_incl'];
- $footer['total_tax_without_discount'] = $footer['total_without_discount_ti'] - $footer['total_without_discount_te'];
+ $footer['total_tourism_tax'] = OrderTaxDetail::getOrderTourismTaxTotal((int) $this->order->id);
+
+ $footer['total_tax_without_discount'] = $footer['total_without_discount_ti'] - $footer['total_without_discount_te'] - $footer['total_tourism_tax'];
if ($footer['total_tax_without_discount'] < 0) {
$footer['total_tax_without_discount'] = 0;
}
@@ -696,7 +620,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'cart_htl_data' => $cart_htl_data,
'is_hotel_order' => HotelBookingDetail::getIdHotelByIdOrder($this->order->id),
'service_product_data' => $service_product_data,
- 'room_extra_demands' => $room_extra_demands,
'room_additinal_services' => $room_additinal_services,
'order' => $this->order,
'order_invoice' => $this->order_invoice,
@@ -728,7 +651,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'summary_tab' => $this->smarty->fetch($this->getTemplate('invoice.summary-tab')),
'product_tab' => $this->smarty->fetch($this->getTemplate('invoice.product-tab')),
'service_product_tab' => $this->smarty->fetch($this->getTemplate('invoice.service-product-tab')),
- 'extra_demands_tab' => $this->smarty->fetch($this->getTemplate('invoice.extra-demands-tab')),
+ 'additinal_services_tab' => $this->smarty->fetch($this->getTemplate('invoice.additinal-services-tab')),
'tax_tab' => $this->getTaxTabContent(),
'payment_tab' => $this->smarty->fetch($this->getTemplate('invoice.payment-tab')),
'note_tab' => $this->smarty->fetch($this->getTemplate('invoice.note-tab')),
@@ -807,11 +730,11 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'room_tax' => $this->order_invoice->getRoomsTaxesBreakdown($this->order),
'additional_services_tax' => $this->order_invoice->getAdditionalServicesTaxesBreakdown($this->order),
'convenience_fee_tax' => $this->order_invoice->getConvenienceFeeTaxesBreakdown($this->order),
- 'extra_demands_tax' => $this->order_invoice->getExtraDemandTaxesBreakdown($this->order),
'service_products_tax' => $this->order_invoice->getServiceProductsTaxesBreakdown($this->order),
'shipping_tax' => $this->order_invoice->getShippingTaxesBreakdown($this->order),
'ecotax_tax' => $this->order_invoice->getEcoTaxTaxesBreakdown(),
'wrapping_tax' => $this->order_invoice->getWrappingTaxesBreakdown(),
+ 'tourism_tax' => $this->order_invoice->getTourismTaxBreakdown(),
);
foreach ($breakdowns as $type => $bd) {
@@ -842,12 +765,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
}
}
- if (isset($breakdowns['extra_demands_tax'])) {
- foreach ($breakdowns['extra_demands_tax'] as &$bd) {
- $bd['total_tax_excl'] = $bd['total_price_tax_excl'];
- }
- }
-
if (isset($breakdowns['service_products_tax'])) {
foreach ($breakdowns['service_products_tax'] as &$bd) {
$bd['total_tax_excl'] = $bd['total_price_tax_excl'];
diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php
index 16396243f..045eeb52a 100644
--- a/classes/pdf/HTMLTemplateOrderSlip.php
+++ b/classes/pdf/HTMLTemplateOrderSlip.php
@@ -267,10 +267,11 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
// 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
+ FROM `' . _DB_PREFIX_ . 'order_tax_detail` odt
LEFT JOIN `' . _DB_PREFIX_ . 'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
WHERE od.`id_order` = ' . (int) $this->order->id . '
- AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD)
+ AND od.`tax_computation_method` = ' . (int) TaxCalculator::ONE_AFTER_ANOTHER_METHOD . '
+ AND NOT EXISTS (SELECT 1 FROM `' . _DB_PREFIX_ . 'tax` tc WHERE tc.`id_tax` = odt.`id_tax` AND tc.`is_tourism_tax` = 1)')
|| Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
}
diff --git a/classes/tax/AverageTaxOfProductsTaxCalculator.php b/classes/tax/AverageTaxOfProductsTaxCalculator.php
index 272935920..3c07d12c6 100644
--- a/classes/tax/AverageTaxOfProductsTaxCalculator.php
+++ b/classes/tax/AverageTaxOfProductsTaxCalculator.php
@@ -20,9 +20,10 @@ class AverageTaxOfProductsTaxCalculator
$sql = 'SELECT t.id_tax, t.rate, od.total_price_tax_excl FROM '.$prefix.'orders o
INNER JOIN '.$prefix.'order_detail od ON od.id_order = o.id_order
- INNER JOIN '.$prefix.'order_detail_tax odt ON odt.id_order_detail = od.id_order_detail
+ INNER JOIN '.$prefix.'order_tax_detail odt ON odt.id_order_detail = od.id_order_detail
INNER JOIN '.$prefix.'tax t ON t.id_tax = odt.id_tax
- WHERE o.id_order = '.(int)$this->id_order;
+ WHERE o.id_order = '.(int)$this->id_order.'
+ AND NOT EXISTS (SELECT 1 FROM '.$prefix.'tax tc WHERE tc.id_tax = odt.id_tax AND tc.is_tourism_tax = 1)';
return $this->db->select($sql);
}
diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index a7f8ee1c3..8bfff493c 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -39,6 +39,9 @@ class TaxCore extends ObjectModel
/** @var bool true if the tax has been historized */
public $deleted = 0;
+ /** @var int 1 = this ps_tax row is a tourism tax (subtype params in tourism_tax) */
+ public $is_tourism_tax = 0;
+
/**
* @see ObjectModel::$definition
*/
@@ -47,11 +50,12 @@ class TaxCore extends ObjectModel
'primary' => 'id_tax',
'multilang' => true,
'fields' => array(
- 'rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
- 'active' => array('type' => self::TYPE_BOOL),
- 'deleted' => array('type' => self::TYPE_BOOL),
+ 'rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
+ 'active' => array('type' => self::TYPE_BOOL),
+ 'deleted' => array('type' => self::TYPE_BOOL),
+ 'is_tourism_tax' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
/* Lang fields */
- 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 32),
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 32),
),
);
@@ -133,7 +137,7 @@ class TaxCore extends ObjectModel
{
return Db::getInstance()->getValue('
SELECT `id_tax`
- FROM `'._DB_PREFIX_.'order_detail_tax`
+ FROM `'._DB_PREFIX_.'order_tax_detail`
WHERE `id_tax` = '.(int)$this->id
);
}
diff --git a/classes/tax/TaxCalculator.php b/classes/tax/TaxCalculator.php
index df2d2d6df..38508d21d 100644
--- a/classes/tax/TaxCalculator.php
+++ b/classes/tax/TaxCalculator.php
@@ -132,14 +132,155 @@ class TaxCalculatorCore
/**
* Return the tax amount associated to each taxes of the TaxCalculator
*
- * @param float $price_te
+ * @param float $price_te
+ * @param string|null $checkInDate
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges
+ * @param int|null $collectionType
+ * @param int $quantity
+ * @param int|null $idCurrency
* @return array $taxes_amount
*/
- public function getTaxesAmount($price_te)
- {
+ public function getTaxesAmount(
+ $price_te,
+ $checkInDate = null,
+ $numNights = 1,
+ $numAdults = 1,
+ $childrenAges = array(),
+ $collectionType = null,
+ $quantity = 1,
+ $idCurrency = null,
+ &$validNightsByTax = null
+ ) {
$taxes_amounts = array();
+ $tourismTaxIds = array();
foreach ($this->taxes as $tax) {
+ if (TaxConfiguration::getByTaxId((int) $tax->id)) {
+ $tourismTaxIds[] = $tax->id;
+ }
+ }
+
+ if ($checkInDate !== null && $collectionType !== null && Configuration::get('QLO_USE_TOURISM_TAX') && $collectionType !== HotelBranchInformation::TAX_COLLECTION_TYPE_AT_HOTEL) {
+ if (!$idCurrency) {
+ $context = Context::getContext();
+ $idCurrency = Validate::isLoadedObject($context->currency) ? (int) $context->currency->id : (int) Configuration::get('PS_CURRENCY_DEFAULT');
+ }
+
+ $checkIn = new DateTime($checkInDate);
+ $isoDayIndex = $checkIn->format('N') - 1;
+
+ $infantMaxAge = Configuration::get('QLO_GLOBAL_MAX_INFANT_AGE');
+ $childMaxAge = Configuration::get('WK_GLOBAL_CHILD_MAX_AGE');
+ $eligibleChildAges = array_filter($childrenAges, function ($age) use ($infantMaxAge, $childMaxAge) {
+ return $age >= $infantMaxAge && $age < $childMaxAge;
+ });
+
+ $runningPriceExcl = (float) $price_te;
+
+ foreach ($this->taxes as $tax) {
+ $tourismTax = TaxConfiguration::getByTaxId((int) $tax->id);
+ if (!$tourismTax) {
+ continue;
+ }
+
+ $hasMultiRanges = (bool) $tourismTax->has_multiple_valid_ranges;
+ $validityRanges = $hasMultiRanges ? TaxValidityRange::getByTaxId((int) $tax->id) : null;
+
+ $specialDays = null;
+ if ($tourismTax->special_days) {
+ $decoded = json_decode($tourismTax->special_days, true);
+ $specialDays = is_array($decoded) ? $decoded : array();
+ }
+
+ $isPerNight = (bool) $tourismTax->per_night;
+
+ if ($isPerNight) {
+ $validNights = 0;
+ for ($i = 0; $i < $numNights; $i++) {
+ $night = clone $checkIn;
+ $night->modify('+' . $i . ' days');
+ if ($hasMultiRanges && !TaxValidityRange::dateMatchesAnyRange($validityRanges, $night)) {
+ continue;
+ }
+ if ($specialDays !== null && !in_array(TaxConfiguration::DAY_KEYS[$night->format('N') - 1], $specialDays)) {
+ continue;
+ }
+ $validNights++;
+ }
+ if ($validNights === 0) {
+ continue;
+ }
+ } else {
+ if ($hasMultiRanges && !TaxValidityRange::dateMatchesAnyRange($validityRanges, $checkIn)) {
+ continue;
+ }
+ if ($specialDays !== null && !in_array(TaxConfiguration::DAY_KEYS[$isoDayIndex], $specialDays)) {
+ continue;
+ }
+ $validNights = $numNights;
+ }
+
+ if ($validNightsByTax !== null) {
+ $validNightsByTax[$tax->id] = $validNights;
+ }
+
+ $taxType = (int) $tourismTax->calculation_type;
+
+ $baseValue = (float) $tourismTax->tax_value;
+ if ($tourismTax->has_tiered_pricing) {
+ $tier = TaxPriceTier::getMatchingTier((int) $tax->id, $runningPriceExcl);
+ if ($tier) {
+ $baseValue = (float) $tier['tax_value'];
+ }
+ }
+
+ $adultMultiplier = 1;
+ if ($isPerNight) {
+ $adultMultiplier *= $validNights;
+ }
+ if ($tourismTax->per_person) {
+ $adultMultiplier *= $numAdults;
+ }
+
+ if ($taxType === TaxConfiguration::CALCULATION_TYPE_FIXED) {
+ $unitAmountAdult = $baseValue;
+ $totalAmountAdult = $baseValue * $adultMultiplier;
+ } else {
+ $unitAmountAdult = $runningPriceExcl * ($baseValue / 100);
+ $totalAmountAdult = $unitAmountAdult * $adultMultiplier;
+ }
+
+ $totalAmountChild = 0.0;
+ if ($tourismTax->apply_on_child && !empty($eligibleChildAges)) {
+ $contribution = TaxChildRange::getChildContribution(
+ $tax->id,
+ $eligibleChildAges,
+ (int) $tourismTax->child_calculation_type,
+ $unitAmountAdult,
+ $tourismTax->has_child_age_range
+ );
+ if ($contribution['count'] > 0) {
+ $nightMultiplier = $isPerNight ? $validNights : 1;
+ $totalAmountChild = $contribution['total'] * $nightMultiplier;
+ }
+ }
+
+ if ($this->computation_method == TaxCalculator::ONE_AFTER_ANOTHER_METHOD) {
+ $runningPriceExcl += $unitAmountAdult;
+ }
+
+ $totalAmountAdult = Tools::convertPrice($totalAmountAdult, $idCurrency);
+ $totalAmountChild = Tools::convertPrice($totalAmountChild, $idCurrency);
+ $taxes_amounts[$tax->id] = Tools::ps_round(($totalAmountAdult + $totalAmountChild) * max(1, $quantity), 6);
+ }
+ }
+
+ foreach ($this->taxes as $tax) {
+ if (in_array($tax->id, $tourismTaxIds)) {
+ continue;
+ }
if (!isset($taxes_amounts[$tax->id])) {
$taxes_amounts[$tax->id] = 0;
}
@@ -155,20 +296,59 @@ class TaxCalculatorCore
}
/**
- * Return the total taxes amount
*
* @param float $price_te
* @return float $amount
*/
- public function getTaxesTotalAmount($price_te)
- {
+ public function getTaxesTotalAmount(
+ $price_te,
+ $checkInDate = null,
+ $numNights = 1,
+ $numAdults = 1,
+ $childrenAges = array(),
+ $collectionType = null,
+ $quantity = 1,
+ $idCurrency = null
+ ) {
$amount = 0;
- $taxes = $this->getTaxesAmount($price_te);
+ $taxes = $this->getTaxesAmount($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity, $idCurrency);
foreach ($taxes as $tax) {
$amount += $tax;
}
return $amount;
}
+
+ /**
+ *
+ * @param float $price_te
+ * @param string $checkInDate
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges
+ * @param int $collectionType
+ * @param int $quantity
+ * @return float price with tourism tax
+ */
+ public function addTourismTaxes($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity = 1)
+ {
+ return $price_te + $this->getTaxesTotalAmount($price_te, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity);
+ }
+
+ /**
+ *
+ * @param float $price_ti
+ * @param string $checkInDate 'YYYY-MM-DD'
+ * @param int $numNights
+ * @param int $numAdults
+ * @param int[] $childrenAges Ages at check-in date
+ * @param int $collectionType HotelBranchInformation::TAX_COLLECTION_TYPE_*
+ * @param int $quantity Line quantity multiplier
+ * @return float price without tourism tax
+ */
+ public function removeTourismTaxes($price_ti, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity = 1)
+ {
+ return $price_ti - $this->getTaxesTotalAmount($price_ti, $checkInDate, $numNights, $numAdults, $childrenAges, $collectionType, $quantity);
+ }
}
diff --git a/classes/tax/TaxChildRange.php b/classes/tax/TaxChildRange.php
new file mode 100644
index 000000000..58d861895
--- /dev/null
+++ b/classes/tax/TaxChildRange.php
@@ -0,0 +1,134 @@
+ 'tax_child_range',
+ 'primary' => 'id_tax_child_range',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'min_age' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'max_age' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ ),
+ );
+
+ /**
+ * All child age ranges for a tax in entry order (id_tax_child_range order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxChildRange::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $ranges = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_child_range` ASC'
+ );
+ Cache::store($cacheId, $ranges);
+
+ return $ranges;
+ }
+
+ /**
+ * Replace all child range rows for $idTax with the submitted arrays, skipping entries where tax_value is empty.
+ *
+ * @param int $idTax
+ * @param array $mins
+ * @param array $maxs
+ * @param array $values
+ * @return void
+ */
+ public static function saveAll($idTax, $mins, $maxs, $values)
+ {
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . (int) $idTax
+ );
+ foreach ($values as $rowIndex => $value) {
+ if ($value === '' || $value === false) {
+ continue;
+ }
+ $range = new TaxChildRange();
+ $range->id_tax = (int) $idTax;
+ $range->min_age = isset($mins[$rowIndex]) ? (int) $mins[$rowIndex] : 0;
+ $range->max_age = isset($maxs[$rowIndex]) ? (int) $maxs[$rowIndex] : 0;
+ $range->tax_value = (float) $value;
+ $range->add();
+ }
+ }
+
+ /**
+ * Sum per-band tax contributions for the given child ages — each child matched to the first qualifying
+ * band (band value interpreted per $childCalcType); unmatched children pay the adult's own already-computed
+ * per-unit tourism tax amount flatly, since they're not governed by any band.
+ *
+ * @param int $idTax
+ * @param int[] $ages Ages at check-in date
+ * @param int $childCalcType 0=fixed, 1=percentage — governs matched-band contributions only
+ * @param float $unitTourismTaxAmountAdult Adult's already-computed per-unit tourism tax amount (tier-aware);
+ * @param bool $useRanges false = skip band lookup, every child is treated as unmatched
+ * @return array ['total' => float, 'count' => int]
+ */
+ public static function getChildContribution($idTax, $ages, $childCalcType, $unitTourismTaxAmountAdult, $useRanges = true)
+ {
+ $ranges = $useRanges ? self::getByTaxId((int) $idTax) : array();
+ $total = 0.0;
+ $count = 0;
+ foreach ($ages as $age) {
+ $age = (int) $age;
+ $matched = false;
+ foreach ($ranges as $range) {
+ $maxAge = (int) $range['max_age'];
+ $inLower = ($age >= (int) $range['min_age']);
+ $inUpper = ($maxAge == 0 || $age <= $maxAge);
+ if ($inLower && $inUpper) {
+ $bandValue = (float) $range['tax_value'];
+ $total += ($childCalcType === TaxConfiguration::CALCULATION_TYPE_FIXED) ? $bandValue : ($unitTourismTaxAmountAdult * ($bandValue / 100));
+ $count++;
+ $matched = true;
+ break;
+ }
+ }
+ if (!$matched) {
+ $total += $unitTourismTaxAmountAdult;
+ $count++;
+ }
+ }
+ return array('total' => $total, 'count' => $count);
+ }
+}
diff --git a/classes/tax/TaxConfiguration.php b/classes/tax/TaxConfiguration.php
new file mode 100644
index 000000000..141761ee9
--- /dev/null
+++ b/classes/tax/TaxConfiguration.php
@@ -0,0 +1,365 @@
+ 'tax_configuration',
+ 'primary' => 'id_tax',
+ 'fields' => array(
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'calculation_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'per_night' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'per_person' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'has_tiered_pricing' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'apply_on_child' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'has_child_age_range' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'child_calculation_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+ 'has_multiple_valid_ranges' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'special_days' => array('type' => self::TYPE_STRING),
+ ),
+ );
+
+ /**
+ * Override add() because id_tax is a FK-as-PK — the base ObjectModel::add() never writes the primary key column, which would default to 0 and create phantom rows.
+ *
+ * @param bool $auto_date ignored — table has no date_add/date_upd
+ * @param bool $null_values ignored
+ * @return bool
+ */
+ public function add($auto_date = true, $null_values = false)
+ {
+ $idTax = (int) $this->id;
+ if (!$idTax) {
+ return false;
+ }
+ $result = Db::getInstance()->insert(
+ 'tax_configuration',
+ array(
+ 'id_tax' => $idTax,
+ 'tax_value' => (float) $this->tax_value,
+ 'calculation_type' => (int) $this->calculation_type,
+ 'per_night' => (int) $this->per_night,
+ 'per_person' => (int) $this->per_person,
+ 'has_tiered_pricing' => (int) $this->has_tiered_pricing,
+ 'apply_on_child' => (int) $this->apply_on_child,
+ 'has_child_age_range' => (int) $this->has_child_age_range,
+ 'child_calculation_type' => (int) $this->child_calculation_type,
+ 'has_multiple_valid_ranges' => (int) $this->has_multiple_valid_ranges,
+ 'special_days' => $this->special_days ? pSQL($this->special_days) : null,
+ )
+ );
+ if ($result) {
+ $this->id_tax = $idTax;
+ }
+ return $result;
+ }
+
+ /**
+ * Load a tourism tax subtype row by id_tax, cached per request.
+ *
+ * @param int $idTax
+ * @return TaxConfiguration|false
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxConfiguration::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $obj = new TaxConfiguration($idTax);
+ $result = Validate::isLoadedObject($obj) ? $obj : false;
+ Cache::store($cacheId, $result);
+
+ return $result;
+ }
+
+ /**
+ * Shared core for cleanFromTourismTaxRulesGroups()/cleanFromVatTaxRulesGroups().
+ *
+ * @param int $idTax
+ * @param bool $isTourismTaxRulesGroup true = clean from tourism tax rules groups, false = clean from VAT tax rules groups
+ * @return int
+ */
+ protected static function cleanTaxRulesGroupsByTourismFlag($idTax, $isTourismTaxRulesGroup)
+ {
+ $flag = $isTourismTaxRulesGroup ? 1 : 0;
+ $db = Db::getInstance();
+ $db->execute(
+ 'DELETE tr FROM `' . _DB_PREFIX_ . 'tax_rule` tr
+ INNER JOIN `' . _DB_PREFIX_ . 'tax_rules_group` trg
+ ON trg.`id_tax_rules_group` = tr.`id_tax_rules_group`
+ WHERE tr.`id_tax` = ' . (int) $idTax . '
+ AND trg.`is_tourism_tax_rule_group` = ' . $flag
+ );
+ return $db->Affected_Rows();
+ }
+
+ /**
+ * Remove this tax from all tourism tax rules groups.
+ *
+ * @param int $idTax
+ * @return int
+ */
+ public static function cleanFromTourismTaxRulesGroups($idTax)
+ {
+ return self::cleanTaxRulesGroupsByTourismFlag($idTax, true);
+ }
+
+ /**
+ * Remove this tax from all standard (non-tourism) tax rules groups — symmetric counterpart of cleanFromTourismTaxRulesGroups().
+ *
+ * @param int $idTax
+ * @return int
+ */
+ public static function cleanFromVatTaxRulesGroups($idTax)
+ {
+ return self::cleanTaxRulesGroupsByTourismFlag($idTax, false);
+ }
+
+ /**
+ * Format a tax rate/amount for display, VAT as a percentage and tourism tax per its own calc type.
+ *
+ * @param mixed $value ps_tax.rate (used for non-tourism rows)
+ * @param array $row List row — must include is_tourism_tax, tourism_tax_calc_type, tourism_tax_value
+ * @param Currency $currency
+ * @return string
+ */
+ public static function getFormattedRateForDisplay($value, $row, $currency)
+ {
+ if (!(int) $row['is_tourism_tax']) {
+ return Tools::safeOutput($value) . '%';
+ }
+ $displayValue = Tools::safeOutput((float) $row['tourism_tax_value']);
+ if ((int) $row['tourism_tax_calc_type'] === self::CALCULATION_TYPE_PERCENTAGE) {
+ return $displayValue . '%';
+ }
+ $currencySign = Tools::safeOutput(trim($currency->prefix . $currency->suffix));
+ return $currencySign . ' ' . $displayValue;
+ }
+
+ /**
+ * Delete the subtype row and all related tiers/child-ranges.
+ *
+ * @return bool
+ */
+ public function delete()
+ {
+ if (parent::delete()) {
+ $idTax = (int) $this->id;
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax
+ );
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_child_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Whether tourism tax should be visually folded into the displayed room/service price.
+ *
+ * @param float $tourismTax
+ * @return bool
+ */
+ public static function isGrossedUp($tourismTax)
+ {
+ return (float) $tourismTax > 0 && (bool) Configuration::get('QLO_TOURISM_TAX_GROSSED_UP');
+ }
+
+ /**
+ * Resolve the hotel's own jurisdiction address and current tourism-tax collection type — shared by every cart, order, and preview caller that needs this context.
+ *
+ * @param int $idHotel 0 = no hotel context (fully standalone product)
+ * @param Address $fallbackAddress Used only when the hotel has no address on file
+ * @return array ['address' => Address, 'collectionType' => int]
+ */
+ public static function resolveHotelAddressAndCollectionType($idHotel, $fallbackAddress)
+ {
+ $idHotel = (int) $idHotel;
+
+ $address = null;
+ if ($idHotel) {
+ $hotelAddress = HotelBranchInformation::getAddress($idHotel);
+ if ($hotelAddress && !empty($hotelAddress['id_address'])) {
+ $address = new Address((int) $hotelAddress['id_address']);
+ }
+ }
+ if (!$address || !Validate::isLoadedObject($address)) {
+ $address = $fallbackAddress;
+ }
+
+ $collectionType = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+ if ($idHotel && Validate::isLoadedObject($hotelBranch = new HotelBranchInformation($idHotel))) {
+ $collectionType = (int) $hotelBranch->tourism_tax_collection_type;
+ }
+
+ return array(
+ 'address' => $address,
+ 'collectionType' => $collectionType,
+ );
+ }
+
+ /**
+ * Resolve the jurisdiction address, collection type, and occupancy (check-in/nights/adults/children) a service product line needs before computing its tourism tax.
+ *
+ * @param int $idHotel 0 = no hotel context (fully standalone product)
+ * @param int $idHtlBookingDetail 0 = not attached to an order-side room booking
+ * @param Address $fallbackAddress Used only when the hotel has no address on file
+ * @param int $idHtlCartBooking 0 = not attached to a cart-side room booking (pre-order preview only —
+ * ignored when $idHtlBookingDetail is given)
+ * @return array ['address' => Address, 'collectionType' => int, 'checkInDate' => string,
+ * 'numNights' => int, 'numAdults' => int, 'childrenAges' => int[]]
+ */
+ public static function resolveServiceLineTaxContext($idHotel, $idHtlBookingDetail, $fallbackAddress, $idHtlCartBooking = 0)
+ {
+ $idHotel = (int) $idHotel;
+ $idHtlBookingDetail = (int) $idHtlBookingDetail;
+ $idHtlCartBooking = (int) $idHtlCartBooking;
+
+ $hotelContext = self::resolveHotelAddressAndCollectionType($idHotel, $fallbackAddress);
+ $address = $hotelContext['address'];
+ $collectionType = $hotelContext['collectionType'];
+
+ $roomBooking = $idHtlBookingDetail ? new HotelBookingDetail($idHtlBookingDetail) : null;
+ $cartBooking = (!$roomBooking && $idHtlCartBooking) ? new HotelCartBookingData($idHtlCartBooking) : null;
+ if ($roomBooking && Validate::isLoadedObject($roomBooking)) {
+ $checkInDate = $roomBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($roomBooking->date_from, $roomBooking->date_to));
+ $numAdults = (int) $roomBooking->adults;
+ $childrenAges = array();
+ if ($roomBooking->child_ages) {
+ $decoded = json_decode($roomBooking->child_ages, true);
+ if (is_array($decoded)) {
+ $childrenAges = array_map('intval', $decoded);
+ }
+ }
+ } elseif ($cartBooking && Validate::isLoadedObject($cartBooking)) {
+ $checkInDate = $cartBooking->date_from;
+ $numNights = max(1, (int) HotelHelper::getNumberOfDays($cartBooking->date_from, $cartBooking->date_to));
+ $numAdults = (int) $cartBooking->adults;
+ $childrenAges = !empty($cartBooking->child_ages) ? (array) json_decode($cartBooking->child_ages, true) : array();
+ } else {
+ $checkInDate = date('Y-m-d');
+ $numNights = 1;
+ $numAdults = 1;
+ $childrenAges = array();
+ }
+
+ return array(
+ 'address' => $address,
+ 'collectionType' => $collectionType,
+ 'checkInDate' => $checkInDate,
+ 'numNights' => $numNights,
+ 'numAdults' => $numAdults,
+ 'childrenAges' => $childrenAges,
+ );
+ }
+
+ /**
+ * Preview parameters for a tax rules group — a deliberate 1-adult/1-night approximation for js/admin/price.js's live price preview.
+ *
+ * @param int $idTaxRulesGroup
+ * @param Address $address
+ * @param int $idLang
+ * @return array List of ['tax_calc_type','is_tiered','tax_value','tiers']
+ */
+ public static function getPreviewParams($idTaxRulesGroup, $address, $idLang, $collectionType = HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE)
+ {
+ $idTaxRulesGroup = (int) $idTaxRulesGroup;
+ if (!$idTaxRulesGroup || Tax::excludeTaxeOption() || (int) $collectionType === HotelBranchInformation::TAX_COLLECTION_TYPE_AT_HOTEL) {
+ return array();
+ }
+
+ $taxCalculator = TaxManagerFactory::getManager($address, $idTaxRulesGroup)->getTaxCalculator();
+ $preview = array();
+
+ $today = new DateTime(date('Y-m-d'));
+ $todayDayKey = self::DAY_KEYS[$today->format('N') - 1];
+
+ foreach ($taxCalculator->taxes as $tax) {
+ $tourismTax = self::getByTaxId((int) $tax->id);
+ if (!$tourismTax) {
+ continue;
+ }
+
+ if ((bool) $tourismTax->has_multiple_valid_ranges
+ && !TaxValidityRange::dateMatchesAnyRange(TaxValidityRange::getByTaxId((int) $tax->id), $today)
+ ) {
+ continue;
+ }
+ if ($tourismTax->special_days) {
+ $specialDays = json_decode($tourismTax->special_days, true);
+ if (!is_array($specialDays) || !in_array($todayDayKey, $specialDays)) {
+ continue;
+ }
+ }
+
+ $tiers = array();
+ if ((bool) $tourismTax->has_tiered_pricing) {
+ foreach (TaxPriceTier::getByTaxId((int) $tax->id) as $tier) {
+ $tiers[] = array(
+ 'min_amount' => (float) $tier['min_amount'],
+ 'max_amount' => (float) $tier['max_amount'],
+ 'tax_value' => (float) $tier['tax_value'],
+ );
+ }
+ }
+ $preview[] = array(
+ 'tax_calc_type' => (int) $tourismTax->calculation_type,
+ 'is_tiered' => (bool) $tourismTax->has_tiered_pricing,
+ 'tax_value' => (float) $tourismTax->tax_value,
+ 'tiers' => $tiers,
+ );
+ }
+
+ return $preview;
+ }
+}
diff --git a/classes/tax/TaxPriceTier.php b/classes/tax/TaxPriceTier.php
new file mode 100644
index 000000000..49550c496
--- /dev/null
+++ b/classes/tax/TaxPriceTier.php
@@ -0,0 +1,116 @@
+ 'tax_price_tier',
+ 'primary' => 'id_tax_price_tier',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'min_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'max_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ 'tax_value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat'),
+ ),
+ );
+
+ /**
+ * All tiers for a tax in entry order (id_tax_price_tier order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxPriceTier::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $tiers = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_price_tier` ASC'
+ );
+ Cache::store($cacheId, $tiers);
+
+ return $tiers;
+ }
+
+ /**
+ * Find the matching tier for a given unit price, or false when no tier matches.
+ *
+ * @param int $idTax
+ * @param float $unitPrice
+ * @return array|false
+ */
+ public static function getMatchingTier($idTax, $unitPrice)
+ {
+ $tiers = self::getByTaxId($idTax);
+ foreach ($tiers as $tier) {
+ $maxAmount = (float) $tier['max_amount'];
+ $inLower = ($unitPrice >= (float) $tier['min_amount']);
+ $inUpper = ($maxAmount == 0 || $unitPrice <= $maxAmount);
+ if ($inLower && $inUpper) {
+ return $tier;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Replace all tier rows for $idTax with the submitted arrays, skipping entries where tax_value is empty.
+ *
+ * @param int $idTax
+ * @param array $mins
+ * @param array $maxs
+ * @param array $values
+ * @return void
+ */
+ public static function saveAll($idTax, $mins, $maxs, $values)
+ {
+ $idTax = (int) $idTax;
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_price_tier`
+ WHERE `id_tax` = ' . $idTax
+ );
+ foreach ($values as $rowIndex => $value) {
+ if ($value === '' || $value === false) {
+ continue;
+ }
+ $tier = new TaxPriceTier();
+ $tier->id_tax = $idTax;
+ $tier->min_amount = isset($mins[$rowIndex]) ? (float) $mins[$rowIndex] : 0;
+ $tier->max_amount = isset($maxs[$rowIndex]) ? (float) $maxs[$rowIndex] : 0;
+ $tier->tax_value = (float) $value;
+ $tier->add();
+ }
+ }
+}
diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index c37d6367a..bf62813a7 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -40,6 +40,9 @@ class TaxRulesGroupCore extends ObjectModel
/** @var string Object last modification date */
public $date_upd;
+ /** @var int 1 = all rules in this TRG reference tourism taxes only */
+ public $is_tourism_tax_rule_group = 0;
+
/**
* @see ObjectModel::$definition
*/
@@ -47,11 +50,12 @@ class TaxRulesGroupCore extends ObjectModel
'table' => 'tax_rules_group',
'primary' => 'id_tax_rules_group',
'fields' => array(
- 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
- 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
- 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
- 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
- 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
+ 'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'deleted' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'is_tourism_tax_rule_group' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
),
);
@@ -139,23 +143,31 @@ class TaxRulesGroupCore extends ObjectModel
return false;
}
- public static function getTaxRulesGroups($only_active = true)
+ /**
+ * @param bool $only_active
+ * @param bool $isTourismTax true = return only tourism TRGs; false (default) = return standard TRGs
+ * @return array
+ */
+ public static function getTaxRulesGroups($only_active = true, $isTourismTax = false)
{
return Db::getInstance()->executeS('
SELECT DISTINCT g.id_tax_rules_group, g.name, g.active
FROM `'._DB_PREFIX_.'tax_rules_group` g'
- .Shop::addSqlAssociation('tax_rules_group', 'g').' WHERE deleted = 0'
+ .Shop::addSqlAssociation('tax_rules_group', 'g').' WHERE deleted = 0
+ AND g.`is_tourism_tax_rule_group` = '.($isTourismTax ? 1 : 0)
.($only_active ? ' AND g.`active` = 1' : '').'
ORDER BY name ASC');
}
/**
- * @return array an array of tax rules group formatted as $id => $name
- */
- public static function getTaxRulesGroupsForOptions()
+ * @param bool $onlyActive
+ * @param bool $isTourismTax true = tourism TRG list with "None" placeholder; false (default) = standard TRG list with "No tax" placeholder
+ * @return array
+ */
+ public static function getTaxRulesGroupsForOptions($onlyActive = true, $isTourismTax = false)
{
- $tax_rules[] = array('id_tax_rules_group' => 0, 'name' => Tools::displayError('No tax'));
- return array_merge($tax_rules, TaxRulesGroup::getTaxRulesGroups());
+ $tax_rules[] = array('id_tax_rules_group' => 0, 'name' => Tools::displayError('No Tax'));
+ return array_merge($tax_rules, TaxRulesGroup::getTaxRulesGroups($onlyActive, $isTourismTax));
}
public function delete()
@@ -222,6 +234,61 @@ class TaxRulesGroupCore extends ObjectModel
);
}
+ /**
+ * @return bool true if any of this group's tax rules reference a tourism tax
+ */
+ public function hasTourismTaxRules()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT tr.`id_tax_rule` FROM `'._DB_PREFIX_.'tax_rule` tr
+ INNER JOIN `'._DB_PREFIX_.'tax` t ON t.`id_tax` = tr.`id_tax`
+ WHERE tr.`id_tax_rules_group` = '.(int) $this->id.'
+ AND t.`is_tourism_tax` = 1'
+ );
+ }
+
+ /**
+ * @return bool true if any product currently uses this group as its tourism tax rule
+ */
+ public function hasProductsUsingAsTourismGroup()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_product` FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_tourism_tax_rules_group` = '.(int) $this->id
+ );
+ }
+
+ /**
+ * @return bool true if any of this group's tax rules reference a non-tourism (VAT) tax
+ */
+ public function hasVatTaxRules()
+ {
+ return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT tr.`id_tax_rule` FROM `'._DB_PREFIX_.'tax_rule` tr
+ INNER JOIN `'._DB_PREFIX_.'tax` t ON t.`id_tax` = tr.`id_tax`
+ WHERE tr.`id_tax_rules_group` = '.(int) $this->id.'
+ AND tr.`id_tax` != 0
+ AND t.`is_tourism_tax` = 0'
+ );
+ }
+
+ /**
+ * @return bool true if any product or service price currently uses this group as its regular (VAT) tax rule
+ */
+ public function hasProductsUsingAsVatGroup()
+ {
+ $hasRegularProductConflict = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_product` FROM `'._DB_PREFIX_.'product_shop`
+ WHERE `id_tax_rules_group` = '.(int) $this->id
+ );
+ $hasServicePriceConflict = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+ SELECT `id_room_type_service_product_price` FROM `'._DB_PREFIX_.'htl_room_type_service_product_price`
+ WHERE `id_tax_rules_group` = '.(int) $this->id
+ );
+
+ return (bool) ($hasRegularProductConflict || $hasServicePriceConflict);
+ }
+
/**
* @deprecated since 1.5
*/
diff --git a/classes/tax/TaxValidityRange.php b/classes/tax/TaxValidityRange.php
new file mode 100644
index 000000000..91aa3dc0c
--- /dev/null
+++ b/classes/tax/TaxValidityRange.php
@@ -0,0 +1,113 @@
+ 'tax_validity_range',
+ 'primary' => 'id_tax_validity_range',
+ 'fields' => array(
+ 'id_tax' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'valid_from' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'allow_null' => true),
+ 'valid_to' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'allow_null' => true),
+ ),
+ );
+
+ /**
+ * All validity ranges for a tax in entry order (id_tax_validity_range order), cached per request.
+ *
+ * @param int $idTax
+ * @return array
+ */
+ public static function getByTaxId($idTax)
+ {
+ $idTax = (int) $idTax;
+ $cacheId = 'TaxValidityRange::getByTaxId-' . $idTax;
+ if (Cache::isStored($cacheId)) {
+ return Cache::retrieve($cacheId);
+ }
+
+ $ranges = Db::getInstance()->executeS(
+ 'SELECT * FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax . '
+ ORDER BY `id_tax_validity_range` ASC'
+ );
+ Cache::store($cacheId, $ranges);
+
+ return $ranges;
+ }
+
+ /**
+ * Whether $date falls within any of the given ranges (OR across rows) — a blank bound on either
+ * @param array $ranges Rows as returned by getByTaxId()
+ * @param DateTime $date
+ * @return bool
+ */
+ public static function dateMatchesAnyRange($ranges, $date)
+ {
+ if (empty($ranges)) {
+ return true;
+ }
+ foreach ($ranges as $range) {
+ $from = (!empty($range['valid_from']) && $range['valid_from'] !== '0000-00-00') ? new DateTime($range['valid_from']) : null;
+ $to = (!empty($range['valid_to']) && $range['valid_to'] !== '0000-00-00') ? new DateTime($range['valid_to']) : null;
+ if ((!$from || $date >= $from) && (!$to || $date <= $to)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Replace all validity-range rows for $idTax with the submitted arrays, skipping rows where
+ * @param int $idTax
+ * @param array $froms
+ * @param array $tos
+ * @return void
+ */
+ public static function saveAll($idTax, $froms, $tos)
+ {
+ Db::getInstance()->execute(
+ 'DELETE FROM `' . _DB_PREFIX_ . 'tax_validity_range`
+ WHERE `id_tax` = ' . $idTax
+ );
+ foreach ($froms as $rowIndex => $from) {
+ $to = isset($tos[$rowIndex]) ? $tos[$rowIndex] : '';
+ $fromEmpty = ($from === '' || $from === false);
+ $toEmpty = ($to === '' || $to === false);
+ if ($fromEmpty && $toEmpty) {
+ continue;
+ }
+ $range = new TaxValidityRange();
+ $range->id_tax = $idTax;
+ $range->valid_from = $fromEmpty ? null : $from;
+ $range->valid_to = $toEmpty ? null : $to;
+ $range->add();
+ }
+ }
+}
diff --git a/classes/webservice/WebserviceOrder.php b/classes/webservice/WebserviceOrder.php
index 9fedace95..ac47fb3fb 100644
--- a/classes/webservice/WebserviceOrder.php
+++ b/classes/webservice/WebserviceOrder.php
@@ -31,5 +31,6 @@ class WebserviceOrderCore extends PaymentModule
$this->displayName = $this->l('Order from API');
$this->validateOrderAmount = false;
$this->payment_type = OrderPayment::PAYMENT_TYPE_ONLINE;
+ $this->idBookingSource = Source::getIdByCode('API_ORDER');
}
}
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 19763851a..54327aa11 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -144,16 +144,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'total_tax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice')
)
- ),
- 'facilities' => array(
- 'resource' => 'facility',
- 'fields' => array(
- 'id_facility' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- 'id_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isString'),
- 'unit_price_without_tax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'),
- 'id_tax_rules_group' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
- )
)
)
)
@@ -273,7 +263,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$parentKeys = array(
'room_types' => 'room_type',
'rooms' => 'room',
- 'facilities' => 'facility',
'services' => 'service',
'cart_rules' => 'cart_rule',
'remarks' => 'remark',
@@ -504,10 +493,8 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
if (count($rooms)) {
$formattedRooms = array();
foreach ($rooms as $roomKey => $room) {
- $selectedDemands = $this->formatDemandsInRequestData($room);
$selectedServices = $this->formatServicesInRequestData($room);
$occupancy = $this->formatOccupancyInRequestData($room, $data['id_room_type']);
- $rooms[$roomKey]['facilities'] = $selectedDemands;
$rooms[$roomKey]['services'] = $selectedServices;
$rooms[$roomKey]['occupancy'] = $occupancy;
$key = $roomKey;
@@ -516,7 +503,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$formattedRooms[$key] = $room;
- $formattedRooms[$key]['facilities'] = $selectedDemands;
$formattedRooms[$key]['services'] = $selectedServices;
$formattedRooms[$key]['occupancy'] = $occupancy;
if (isset($room['id_tax_rules_group'])) {
@@ -609,36 +595,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return $formattedServices;
}
- public function formatDemandsInRequestData($data)
- {
- $selectedDemands = array();
- if (isset($data['facilities']['facility'][0])) {
- $selectedDemands = $data['facilities']['facility'];
- } else if (isset($data['facilities'])
- && !isset($data['facilities'][0])
- && isset($data['facilities']['facility'])
- ) {
- $selectedDemands[] = $data['facilities']['facility'];
- } else if (isset($data['facilities']) && isset($data['facilities'][0])) {
- $selectedDemands = $data['facilities'];
- }
-
- $formattedDemands = array();
- foreach ($selectedDemands as $key => $demand) {
- $formattedDemands[$key]['id_global_demand'] = isset($demand['id_facility']) ? $demand['id_facility'] : 0;
- $formattedDemands[$key]['id_option'] = isset($demand['id_option']) ? $demand['id_option'] : 0;
- if (isset($demand['unit_price_without_tax'])) {
- $formattedDemands[$key]['unit_price_without_tax'] = $demand['unit_price_without_tax'];
- }
-
- if (isset($demand['id_tax_rules_group'])) {
- $formattedDemands[$key]['id_tax_rules_group'] = $demand['id_tax_rules_group'];
- }
- }
-
- return $formattedDemands;
- }
-
/**
* Validating the POST request.
*/
@@ -823,11 +779,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return false;
}
- if (isset($room['facilities']) && $room['facilities']
- && !$this->validateRequestedDemands($room['facilities'], $roomType['id_room_type'])
- ) {
- return false;
- }
}
}
} else {
@@ -973,7 +924,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
null,
false
)) {
- $this->updateServicesAndDemandsInOrder($objPaymentModule->currentOrder);
+ $this->updateServicesInOrder($objPaymentModule->currentOrder);
if (!empty($this->wsRequestedRooms)) {
$this->updateRoomTaxRulesGroupsInOrder($objPaymentModule->currentOrder);
}
@@ -1015,7 +966,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->addCartRulesToOrder(array($cartRule), $objOrder->id);
} else if ($params['price_details']['total_price_with_tax'] > $objOrder->total_paid_tax_incl) {
$objHotelBookingDetail = new HotelBookingDetail();
- $objHotelBookingDemands = new HotelBookingDemands();
if ($roomsInOrder = $objHotelBookingDetail->getOrderCurrentDataByOrderId($idOrder)) {
$requestedPrice = $params['price_details']['total_price_with_tax'];
$roomsToUpdate = array();
@@ -1030,12 +980,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$serviceProductPrice = $objOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
- if ($demands = $objHotelBookingDemands->getExtraDemandsTaxesDetails($objOrder->id)) {
- $demandsPrice = array_sum(array_column($demands, 'total_price_tax_excl'));
- // Adding the tax
- $demandsPrice += array_sum(array_column($demands, 'total_amount'));
- $serviceProductPrice += $demandsPrice;
- }
$requestedPrice -= $serviceProductPrice;
// This empty means that all the rooms are sent with price in the request, so we will add a service to a room to manage the order total sent in the request.
@@ -1105,7 +1049,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRooms[$dateRoomJoinKey]['total_tax']/$objHotelBookingDetail->total_price_tax_excl)*100, $objAddress);
} else if (isset($this->wsRequestedRooms[$dateRoomJoinKey]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$priceWithTax = $objHotelBookingDetail->total_price_tax_excl + $this->wsRequestedRooms[$dateRoomJoinKey]['total_tax'];
}
@@ -1134,7 +1082,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objOrderDetail->save();
if (isset($this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'], (int) $objHotelBookingDetail->id, 0);
}
$objOrder->total_paid += $taxDiff;
$objOrder->total_paid_tax_incl += $taxDiff;
@@ -1146,17 +1094,22 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
}
- public function saveTaxCalculator($idOrderDetail, $idTaxRulesGroup)
+ public function saveTaxCalculator($idOrderDetail, $idTaxRulesGroup, $idHtlBooking = 0, $idServiceProductOrderDetail = 0)
{
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$idOrderDetail);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$idOrderDetail.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$idTax = $this->wsTaxRulesGroup[$idTaxRulesGroup]['tax'];
$objOrderDetail = new OrderDetail($idOrderDetail);
- $values = '('.(int)$objOrderDetail->id.','.(int)$idTax.','.
+ $values = '('.(int)$objOrderDetail->id_order.','.(int)$objOrderDetail->id.','.(int)$idHtlBooking.','.(int)$idServiceProductOrderDetail.','.(int)$idTax.','.
(float)($objOrderDetail->unit_price_tax_incl - $objOrderDetail->unit_price_tax_excl).','.
- (float)($objOrderDetail->total_price_tax_incl - $objOrderDetail->total_price_tax_excl).'),';
+ (float)($objOrderDetail->total_price_tax_incl - $objOrderDetail->total_price_tax_excl).',NOW()),';
$values = rtrim($values, ',');
- $sql = 'INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (id_order_detail, id_tax, unit_amount, total_amount)
+ $sql = 'INSERT INTO `'._DB_PREFIX_.'order_tax_detail`
+ (id_order, id_order_detail, id_htl_booking, id_service_product_order_detail, id_tax, unit_amount, total_amount, date_add)
VALUES '.$values;
return Db::getInstance()->execute($sql);
@@ -1165,7 +1118,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
/**
* Updating the services and their prices.
*/
- public function updateServicesAndDemandsInOrder($idOrder)
+ public function updateServicesInOrder($idOrder)
{
$objOrder = new Order($idOrder);
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
@@ -1267,7 +1220,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax']/$objServiceProductOrderDetail->total_price_tax_excl)*100, $objAddress);
} else if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $objServiceProductOrderDetail->total_price_tax_excl + $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'];
$priceDiffTaxIncl = $unitPriceTaxIncl - $objServiceProductOrderDetail->total_price_tax_incl;
@@ -1296,27 +1253,17 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objServiceProductOrderDetail->save();
$objOrderDetail->save();
if (!$isAutoAdded && isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
}
}
- // To save the changes made till now, since we are again loading this order while adding demands if any.
+ // To save the changes made till now, since we are again loading this order while adding if any.
$objOrder->save();
}
$objHotelBookingDetail = new HotelBookingDetail();
- if ($orderedRooms = $objHotelBookingDetail->getOrderCurrentDataByOrderId($objOrder->id)) {
- foreach ($orderedRooms as $orderedRoom) {
- $dateRoomJoinKey = strtotime($orderedRoom['date_from']).''.strtotime($orderedRoom['date_to']).$orderedRoom['id_room'];
- if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) && $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) {
- if ($demands = json_decode($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'], true)) {
- $this->addDemandsInOrderedRoom($demands, $orderedRoom['id']);
- }
- }
- }
- }
}
}
@@ -1626,47 +1573,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return true;
}
- /**
- * Validating the demands related information.
- */
- public function validateRequestedDemands($requestedDemands, $idRoomType)
- {
- $objHotelRoomTypeDemand = new HotelRoomTypeDemand();
- $objHotelDemandOptions = new HotelRoomTypeGlobalDemandAdvanceOption();
- // Incase the there is no demand for this room but demands are still sent in the request for this room type.
- if ($roomTypeDemands = $objHotelRoomTypeDemand->getRoomTypeDemands($idRoomType)) {
- foreach ($requestedDemands as $demandKey => $requestedDemand) {
- if (!isset($requestedDemand['id_global_demand'])
- || !isset($roomTypeDemands[$requestedDemand['id_global_demand']])
- ) {
- $this->error_msg = Tools::displayError('Invalid request for facilities.');
- return false;
- } else if (isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'])
- && (!isset($requestedDemand['id_option']))
- ) {
- $this->error_msg = sprintf(Tools::displayError('Id option is required for the facility with ID %s.'), $requestedDemand['id_global_demand']);
- return false;
- } else if (isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'])
- && !isset($roomTypeDemands[$requestedDemand['id_global_demand']]['adv_option'][$requestedDemand['id_option']])
- ) {
- $this->error_msg = sprintf(Tools::displayError('Invalid id option for the facility with ID %s.'), $requestedDemand['id_global_demand']);
- return false;
- } else if (isset($requestedDemand['id_tax_rules_group']) && !Validate::isLoadedObject(new TaxRulesGroup((int) $requestedDemand['id_tax_rules_group']))) {
- $this->error_msg = Tools::displayError('Invalid id_tax_rules_group for facilities.');
- return false;
- } else if (isset($requestedDemand['total_tax']) && !Validate::isPrice($requestedDemand['total_tax'])) {
- $this->error_msg = Tools::displayError('Invalid tax for facilities.');
- return false;
- }
- }
- } else {
- $this->error_msg = Tools::displayError('Invalid request for facilities.');
- return false;
- }
-
- return true;
- }
-
/**
* Adding rooms in the cart.
*/
@@ -1719,7 +1625,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
// since we cannot update them after ordering them and will have to replace them if orderd here. So, we will not add them for now.
- $roomDemands = json_encode(array());
if (isset($room['occupancy']) && count($room['occupancy'])) {
$occupancy = $room['occupancy'];
@@ -1742,7 +1647,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$idRoom,
$dateFrom,
$dateTo,
- $roomDemands,
$roomServices,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -1750,14 +1654,8 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objCartBookingData = new HotelCartBookingData((int) $idHtlCartBookingData);
$dateRoomJoinKey = strtotime($dateFrom).strtotime($dateTo).$objCartBookingData->id_room;
// To update the price after valiate order is called.
- if (isset($room['facilities'])
- && $room['facilities']
- ) {
- $roomDemands = json_encode($room['facilities']);
- }
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'] = $roomServices;
- $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'] = $roomDemands;
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['room'] = $room;
if (isset($room['id_tax_rules_group']) && Validate::isLoadedObject(new TaxRulesGroup((int) $room['id_tax_rules_group']))) {
$this->wsRequestedRooms[$dateRoomJoinKey]['id_tax_rules_group'] = $room['id_tax_rules_group'];
@@ -1795,7 +1693,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$roomWiseOccupancy = count($roomWiseOccupancy);
}
- $roomDemands = json_encode(array());
$roomServices = array();
$objHotelCartBookingData->updateCartBooking(
$roomType['id_room_type'],
@@ -1805,7 +1702,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
0,
$dateFrom,
$dateTo,
- $roomDemands,
$roomServices,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -2031,7 +1927,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
// Update the information for the services that were updated in the existing rooms
if (count($roomsToUpdate)) {
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
- $objBookingDemand = new HotelBookingDemands();
foreach ($roomsToUpdate as $roomsByDate) {
if (isset($roomsByDate['requested'])
&& $roomsByDate['requested']
@@ -2080,18 +1975,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$this->addServicesInOrderedRoom($room['services'], $idHotelBookingDetail);
- // Since we don't store the id_global_demand in the order, we will remove the previous ones and add the new ones.
- $requestedDemands = $room['facilities'];
- $roomExtraDemand = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 0
- );
- $this->removeDemandsInOrderedRoom($roomExtraDemand);
- $this->addDemandsInOrderedRoom($requestedDemands, $idHotelBookingDetail);
}
} else if (isset($roomsByDate['order'])
&& $roomsByDate['order']
@@ -2375,7 +2258,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'] = $this->createTaxRule(($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax']/$totalPriceTaxExcl)*100, $objAddress);
} else if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $objServiceProductOrderDetail->total_price_tax_excl + $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['total_tax'];
$priceDiffTaxIncl = $unitPriceTaxIncl - $objServiceProductOrderDetail->total_price_tax_incl;
}
@@ -2434,19 +2321,13 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
if (!$isAutoAdded && isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $this->wsRequestedRoomTypes[$dateRoomJoinKey]['services'][$service['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
$objOrder->save();
}
-
- if (isset($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) && $this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands']) {
- if ($demands = json_decode($this->wsRequestedRoomTypes[$dateRoomJoinKey]['demands'], true)) {
- $this->addDemandsInOrderedRoom($demands, $objBookingDetail->id);
- }
- }
}
}
}
@@ -2580,7 +2461,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
public function removeRoomLineFromOrder($params, $roomsToRemove)
{
$objOrder = new Order((int) $params['id']);
- $objBookingDemand = new HotelBookingDemands();
$objHotelBookingDetail = new HotelBookingDetail();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
foreach ($roomsToRemove as $roomType) {
@@ -2592,26 +2472,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$idHotel = $roomType['id_hotel'];
$bookingPriceTaxIncl = $roomType['total_price_tax_incl'];
$bookingPriceTaxExcl = $roomType['total_price_tax_excl'];
- $roomExtraDemandTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $roomType['id_product'],
- $roomType['id_room'],
- $dateFrom,
- $dateTo,
- 0,
- 1,
- 1
- );
- $roomExtraDemandTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $roomType['id_product'],
- $roomType['id_room'],
- $dateFrom,
- $dateTo,
- 0,
- 1,
- 0
- );
$additionlServicesTI = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -2691,9 +2551,9 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
// Update Order
// values changes as values are calculated accoding to the quantity of the product by webkul
- $objOrder->total_paid = Tools::ps_round($objOrder->total_paid - ($diffProductsTaxIncl + $roomExtraDemandTI + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
- $objOrder->total_paid_tax_incl = Tools::ps_round($objOrder->total_paid_tax_incl - ($diffProductsTaxIncl + $roomExtraDemandTI + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
- $objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->total_paid_tax_excl - ($diffProductsTaxExcl + $roomExtraDemandTE + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid = Tools::ps_round($objOrder->total_paid - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid_tax_incl = Tools::ps_round($objOrder->total_paid_tax_incl - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
+ $objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->total_paid_tax_excl - ($diffProductsTaxExcl + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products = Tools::ps_round($objOrder->total_products - ($diffProductsTaxExcl + $additionlServicesTE), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products_wt = Tools::ps_round($objOrder->total_products_wt - ($diffProductsTaxIncl + $additionlServicesTI), _PS_PRICE_COMPUTE_PRECISION_);
@@ -2725,8 +2585,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
$objOrder->update();
- // delete the demands of this booking
- $objBookingDemand->deleteBookingDemands($idHotelBooking);
$objServiceProductOrderDetail->deleteSeviceProducts(0, $idHotelBooking);
$objHotelCartBookingData = new HotelCartBookingData();
$objHotelCartBookingData->deleteOrderedRoomFromCart(
@@ -2967,12 +2825,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
return false;
}
- if (isset($room['facilities']) && $room['facilities']
- && !$this->validateRequestedDemands($room['facilities'], $roomType['id_room_type'])
- ) {
- return false;
- }
-
if (isset($room['id_tax_rules_group']) && !Validate::isLoadedObject(new TaxRulesGroup((int) $room['id_tax_rules_group']))) {
$this->error_msg = Tools::displayError('Invalid id_tax_rules_group.');
return false;
@@ -3340,7 +3192,11 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$unitPriceTaxIncl = Tools::ps_round($totalPriceTaxIncl / $quantity, _PS_PRICE_COMPUTE_PRECISION_);
} else if (isset($services[$product['id_product']]['total_tax'])) {
$objOrderDetail->id_tax_rules_group = 0;
- Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_detail_tax` WHERE id_order_detail='.(int)$objOrderDetail->id);
+ Db::getInstance()->execute(
+ 'DELETE otd FROM `'._DB_PREFIX_.'order_tax_detail` otd
+ WHERE otd.`id_order_detail` = '.(int)$objOrderDetail->id.'
+ AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'tax` tc WHERE tc.`id_tax` = otd.`id_tax` AND tc.`is_tourism_tax` = 1)'
+ );
$unitPriceTaxIncl = $unitPriceTaxExcl + $services[$product['id_product']]['total_tax'];
$totalPriceTaxIncl = Tools::ps_round(($unitPriceTaxIncl * $quantity), _PS_PRICE_COMPUTE_PRECISION_);
}
@@ -3393,7 +3249,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$objOrderDetail->update();
if (!$isAutoAdded && isset($services[$product['id_product']]['id_tax_rules_group'])) {
- $this->saveTaxCalculator($objOrderDetail->id, $services[$product['id_product']]['id_tax_rules_group']);
+ $this->saveTaxCalculator($objOrderDetail->id, $services[$product['id_product']]['id_tax_rules_group'], 0, (int) $objServiceProductOrderDetail->id);
}
}
}
@@ -3406,117 +3262,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
}
- /**
- * Adding the demands into the order.
- */
- public function addDemandsInOrderedRoom($demands, $idHotelBooking)
- {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail((int) $idHotelBooking))) {
- if ($demands) {
- $objOrder = new Order($objBookingDetail->id_order);
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($objOrder->id_currency);
-
- $objAddress = new Address((int) $objOrder->id_address_tax);
- $idLang = (int) $objOrder->id_lang;
- $idProduct = $objBookingDetail->id_product;
- $objHtlBkDtl = new HotelBookingDetail();
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($demands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $idHotelBooking;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
-
- $unitPriceTaxExcl = HotelRoomTypeDemand::getPriceStatic($idProduct, $idGlobalDemand, $idOption, 0);
- $unitPriceTaxIncl = HotelRoomTypeDemand::getPriceStatic($idProduct, $idGlobalDemand, $idOption, 1);
- $taxMultiplier = 1;
- if ($unitPriceTaxExcl > 0) {
- $taxMultiplier = $unitPriceTaxIncl / $unitPriceTaxExcl;
- }
-
- $qty = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- if ($numDays > 1) {
- $qty *= $numDays;
- }
- }
-
- $totalPriceTaxExcl = $unitPriceTaxExcl * $qty;
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- if (isset($demand['unit_price_without_tax'])) {
- $unitPriceTaxExcl = $demand['unit_price_without_tax'];
- $unitPriceTaxIncl = $demand['unit_price_without_tax'] * $taxMultiplier;
- $totalPriceTaxExcl = $unitPriceTaxExcl * $qty;
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- }
-
- if (isset($demand['id_tax_rules_group'])) {
- $objTaxManager = TaxManagerFactory::getManager(
- $objAddress,
- $demand['id_tax_rules_group']
- );
- $objTaxManager = TaxManagerFactory::getManager($objAddress, $demand['id_tax_rules_group']);
- $objTaxCalculator = $objTaxManager->getTaxCalculator();
-
- $unitPriceTaxIncl = $objTaxCalculator->addTaxes($unitPriceTaxExcl);
- $totalPriceTaxIncl = $unitPriceTaxIncl * $qty;
- } else {
- $objTaxManager = TaxManagerFactory::getManager(
- $objAddress,
- $objGlobalDemand->id_tax_rules_group
- );
- $objTaxCalculator = $objTaxManager->getTaxCalculator();
- }
-
- $objBookingDemand->unit_price_tax_excl = $unitPriceTaxExcl;
- $objBookingDemand->unit_price_tax_incl = $unitPriceTaxIncl;
- $objBookingDemand->total_price_tax_excl = $totalPriceTaxExcl;
- $objBookingDemand->total_price_tax_incl = $totalPriceTaxIncl;
- $objOrderDetail = new OrderDetail($objBookingDetail->id_order_detail);
-
- // Update OrderInvoice of this OrderDetail
- if ($objOrderDetail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $objOrderInvoice = new OrderInvoice($objOrderDetail->id_order_invoice);
- $objOrderInvoice->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
- $objOrderInvoice->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
- $objOrderInvoice->update();
- }
-
- // change order total
- $objOrder->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl;
- $objOrder->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl;
- $objOrder->total_paid += $objBookingDemand->total_price_tax_incl;
- $objBookingDemand->price_calc_method = $objGlobalDemand->price_calc_method;
- $objBookingDemand->id_tax_rules_group = $objGlobalDemand->id_tax_rules_group;
- if ($objBookingDemand->save()
- && Validate::isLoadedObject($objAddress)
- ) {
- $objBookingDemand->tax_computation_method = (int)$objTaxCalculator->computation_method;
- $objBookingDemand->tax_calculator = $objTaxCalculator;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
-
- $objOrder->save();
- }
- }
- }
-
/**
* Deleting the demands into the order.
*/
@@ -3555,7 +3300,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
}
- private function manageBookingFilter($filters)
+ private function manageBookingFilter($filters)
{
$ret = '';
$allowedFilters = $this->allowedFilters;
@@ -4072,7 +3817,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
} else {
$objCurrency = new Currency($objOrder->id_currency);
$objBookingDetail = new HotelBookingDetail();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$objOrderReturn = new OrderReturn();
$idHotel = HotelBookingDetail::getIdHotelByIdOrder($objOrder->id);
@@ -4154,35 +3898,6 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$roomInfo['child'] = (int) $orderData['children'];
$roomInfo['unit_price_without_tax'] = Tools::ps_round($orderData['total_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_);
$roomInfo['total_tax'] = Tools::ps_round(($orderData['total_price_tax_incl'] - $orderData['total_price_tax_excl']), _PS_PRICE_COMPUTE_PRECISION_);
- if(isset($roomInfo['facilities'])) {
- unset($roomInfo['facilities']);
- }
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $orderData['id_order'],
- $orderData['id_product'],
- $orderData['id_room'],
- $orderData['date_from'],
- $orderData['date_to'],
- 0,
- 0,
- $useTax
- )) {
- $roomInfo['facilities'] = array();
- foreach ($extraDemands as $extraDemand) {
- $demand = array();
- $demand['name'] = $extraDemand['name'];
- $demand['quantity'] = 1;
- $demand['unit_price_without_tax'] = Tools::ps_round($extraDemand['unit_price_tax_excl'], _PS_PRICE_COMPUTE_PRECISION_);
- $demand['total_tax'] = Tools::ps_round(($extraDemand['unit_price_tax_incl']- $extraDemand['unit_price_tax_excl']), _PS_PRICE_COMPUTE_PRECISION_);
-
- $demand['per_night'] = 0;
- if ($extraDemand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $demand['per_night'] = 1;
- }
-
- $roomInfo['facilities'][] = $demand;
- }
- }
if(isset($roomInfo['services'])) {
unset($roomInfo['services']);
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 9a0bac0bc..cbcb74c41 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -1057,7 +1057,7 @@ class AdminCartsControllerCore extends AdminController
if ($bookingInfo['id'] == $id_booking_data) {
$amt_with_qty = $bookingInfo['amt_with_qty'];
$bookingInfo['amt_with_qty'] = Tools::displayPrice($amt_with_qty);
- $bookingInfo['total_price'] = Tools::displayPrice($amt_with_qty + $bookingInfo['demand_price'] + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
+ $bookingInfo['total_price'] = Tools::displayPrice($amt_with_qty + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
$response = array(
'curr_booking_info' => $bookingInfo,
'cart_info' => $this->ajaxReturnVars(),
@@ -1130,7 +1130,7 @@ class AdminCartsControllerCore extends AdminController
if ($bookingInfo['id'] == $idBookingData) {
$amtWithQty = $bookingInfo['amt_with_qty'];
$bookingInfo['amt_with_qty'] = Tools::displayPrice($amtWithQty);
- $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['demand_price'] + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
+ $bookingInfo['total_price'] = Tools::displayPrice($amtWithQty + $bookingInfo['additional_service_price'] + $bookingInfo['additional_services_auto_add_price']);
$response = array(
'curr_booking_info' => $bookingInfo,
'cart_info' => $this->ajaxReturnVars(),
@@ -1154,8 +1154,8 @@ class AdminCartsControllerCore extends AdminController
}
}
- // Process to get extra demands of any room while order creation process form.tpl
- public function ajaxProcessGetRoomTypeCartDemands()
+ // Process to get extra services of any room while order creation process form.tpl
+ public function ajaxProcessGetRoomTypeCartServices()
{
$response['hasError'] = false;
$response['errors'] = [];
@@ -1167,38 +1167,6 @@ class AdminCartsControllerCore extends AdminController
&& ($idHotelCartBooking = Tools::getValue('id_hotel_cart_booking'))
) {
$objCartBookingData = new HotelCartBookingData();
- if ($selectedRoomDemands = $objCartBookingData->getCartExtraDemands(
- $idCart,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo
- )) {
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- foreach ($selectedRoomDemands as &$selectedDemand) {
- $objRoom = new HotelRoomInformation($selectedDemand['id_room']);
- $selectedDemand['room_num'] = $objRoom->room_num;
- if (isset($selectedDemand['extra_demands']) && $selectedDemand['extra_demands']) {
- $extraDmd = array();
- foreach ($selectedDemand['extra_demands'] as $sDemand) {
- $selectedDemand['selected_global_demands'][] = $sDemand['id_global_demand'];
- $extraDmd[$sDemand['id_global_demand'].'-'.$sDemand['id_option']] = $sDemand;
- }
- $selectedDemand['extra_demands'] = $extraDmd;
- }
- }
- $this->context->smarty->assign('roomTypeDemands', $roomTypeDemands);
- $this->context->smarty->assign('selectedRoomDemands', $selectedRoomDemands);
- }
- }
$selectedRoomServiceProduct = array();
if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
@@ -1270,8 +1238,8 @@ class AdminCartsControllerCore extends AdminController
'can_edit' => $this->tabAccess['edit'],
));
- $response['html_exta_demands'] = $this->context->smarty->fetch(
- _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/_cart_booking_demands.tpl'
+ $response['html_exta_services'] = $this->context->smarty->fetch(
+ _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/_cart_booking_services.tpl'
);
} else {
$response['hasError'] = true;
@@ -1281,26 +1249,6 @@ class AdminCartsControllerCore extends AdminController
$this->ajaxDie(json_encode($response));
}
- // Process when admin changes extra demands of any room while order creation process form.tpl
- public function ajaxProcessChangeRoomDemands()
- {
- if ($this->tabAccess['edit'] === 1) {
- $response = array('status' => false);
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- $response['status'] = true;
- }
- }
- }
- $this->ajaxDie(json_encode($response));
- }
- }
-
public static function getOrderTotalUsingTaxCalculationMethod($id_cart)
{
$context = Context::getContext();
diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php
index 7fd12828e..dc14150e6 100644
--- a/controllers/admin/AdminCustomerPreferencesController.php
+++ b/controllers/admin/AdminCustomerPreferencesController.php
@@ -107,6 +107,20 @@ class AdminCustomerPreferencesControllerCore extends AdminController
'cast' => 'intval',
'type' => 'bool'
),
+ 'PS_CUSTOMER_NATIONALITY' => array(
+ 'title' => $this->l('Enable nationality'),
+ 'hint' => $this->l('Display or not the nationality field.'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
+ 'PS_CUSTOMER_NATIONALITY_MANDATORY' => array(
+ 'title' => $this->l('Nationality is mandatory'),
+ 'hint' => $this->l('If you choose yes, your customer will have to select their nationality.'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
'PS_CUSTOMER_NWSL' => array(
'title' => $this->l('Enable newsletter registration'),
'hint' => $this->l('Display or not the newsletter registration tick box.'),
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index b013b3fe8..bb2fd3fc4 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -77,12 +77,39 @@ class AdminCustomersControllerCore extends AdminController
$groups_array[$group['id_group']] = $group['name'];
}
+ $selected_nationalities = array();
+ $nationalities_result = Db::getInstance()->executeS('
+ SELECT DISTINCT cl.id_country, cl.name
+ FROM '._DB_PREFIX_.'customer c
+ INNER JOIN '._DB_PREFIX_.'country_lang cl ON (cl.id_country = c.id_country AND cl.id_lang = '.(int)$this->context->language->id.')
+ WHERE c.id_country != 0 AND c.deleted = 0
+ ORDER BY cl.name ASC
+ ');
+ foreach ($nationalities_result as $row) {
+ $selected_nationalities[$row['id_country']] = $row['name'];
+ }
+ $selected_nationalities[-1] = $this->l('Other');
+ $selected_nationalities[0] = $this->l('None');
+
+ $selected_countries = array();
+ $countries_result = Db::getInstance()->executeS('
+ SELECT DISTINCT cl.id_country, cl.name
+ FROM '._DB_PREFIX_.'address ad
+ INNER JOIN '._DB_PREFIX_.'country_lang cl ON (cl.id_country = ad.id_country AND cl.id_lang = '.(int)$this->context->language->id.')
+ WHERE ad.deleted = 0
+ ORDER BY cl.name ASC
+ ');
+ foreach ($countries_result as $row) {
+ $selected_countries[$row['id_country']] = $row['name'];
+ }
+
$this->_join = 'LEFT JOIN '._DB_PREFIX_.'gender_lang gl ON (a.id_gender = gl.id_gender AND gl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'group_lang grl ON (a.id_default_group = grl.id_group AND grl.id_lang = '.(int)$this->context->language->id.')';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'orders o ON (a.id_customer = o.id_customer)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'address ad ON (ad.id_customer = a.id_customer AND ad.deleted = 0)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'state adstate ON (adstate.id_state = ad.id_state)';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'country_lang adcountry ON (adcountry.id_country = ad.id_country AND adcountry.id_lang = '.(int)$this->context->language->id.')';
+ $this->_join .= ' LEFT JOIN '._DB_PREFIX_.'country_lang natcountry ON (natcountry.id_country = a.id_country AND natcountry.id_lang = '.(int)$this->context->language->id.')';
$this->_group = 'GROUP BY a.`id_customer`';
$this->fields_list = array(
@@ -134,6 +161,16 @@ class AdminCustomersControllerCore extends AdminController
'list' => $groups_array,
'filter_key' => 'a!id_default_group',
),
+ 'nationality' => array(
+ 'title' => $this->l('Nationality'),
+ 'optional' => true,
+ 'visible_default' => false,
+ 'type' => 'select',
+ 'list' => $selected_nationalities,
+ 'filter_key' => 'a!id_country',
+ 'filter_type' => 'int',
+ 'orderby' => false,
+ ),
'total_orders' => array(
'title' => $this->l('Number of orders'),
'type' => 'range',
@@ -205,7 +242,10 @@ class AdminCustomersControllerCore extends AdminController
'title' => $this->l('Country'),
'optional' => true,
'visible_default' => false,
- 'havingFilter' => true,
+ 'type' => 'select',
+ 'list' => $selected_countries,
+ 'filter_key' => 'ad!id_country',
+ 'filter_type' => 'int',
'orderby' => false,
),
'address_phone' => array(
@@ -299,7 +339,8 @@ class AdminCustomersControllerCore extends AdminController
ad.company as address_company, ad.vat_number,
ad.address1, ad.address2, ad.city, adstate.name as state,
ad.postcode, adcountry.name as country, ad.phone as address_phone,
- ad.phone_mobile, ad.dni';
+ ad.phone_mobile, ad.dni,
+ (CASE WHEN a.id_country = -1 THEN \''.pSQL($this->l('Other')).'\' ELSE natcountry.name END) as nationality';
// Check if we can add a customer
if (Shop::isFeatureActive() && (Shop::getContext() == Shop::CONTEXT_ALL || Shop::getContext() == Shop::CONTEXT_GROUP)) {
@@ -585,6 +626,22 @@ class AdminCustomersControllerCore extends AdminController
'years' => $years
)
),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Nationality'),
+ 'name' => 'id_country',
+ 'required' => (bool)(Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY')),
+ 'col' => '4',
+ 'options' => array(
+ 'query' => Customer::getNationalities($this->context->language->id),
+ 'id' => 'id_country',
+ 'name' => 'name',
+ 'default' => array(
+ 'value' => '',
+ 'label' => $this->l('-- Choose --')
+ )
+ ),
+ ),
array(
'type' => 'switch',
'label' => $this->l('Enabled'),
@@ -942,6 +999,16 @@ class AdminCustomersControllerCore extends AdminController
$gender = new Gender($customer->id_gender, $this->context->language->id);
$gender_image = $gender->getImage();
+ $nationality = '';
+ if ($customer->id_country == -1) {
+ $nationality = Translate::getAdminTranslation('Other', 'AdminCustomers');
+ } elseif ($customer->id_country) {
+ $nationalityCountry = new Country($customer->id_country, $this->context->language->id);
+ if (Validate::isLoadedObject($nationalityCountry)) {
+ $nationality = $nationalityCountry->name;
+ }
+ }
+
$customer_stats = $customer->getStats();
$sql = 'SELECT SUM(total_paid_real) FROM '._DB_PREFIX_.'orders WHERE id_customer = %d AND valid = 1';
if ($total_customer = Db::getInstance()->getValue(sprintf($sql, $customer->id))) {
@@ -1091,6 +1158,7 @@ class AdminCustomersControllerCore extends AdminController
'shop_is_feature_active' => Shop::isFeatureActive(),
'name_shop' => $shop->name,
'customer_birthday' => Tools::displayDate($customer->birthday),
+ 'nationality' => $nationality,
'last_update' => Tools::displayDate($customer->date_upd, null, true),
'customer_exists' => Customer::customerExists($customer->email),
'id_lang' => $customer->id_lang,
@@ -1326,6 +1394,10 @@ class AdminCustomersControllerCore extends AdminController
}
}
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY') && !Tools::getValue('id_country')) {
+ $this->errors[] = Tools::displayError('Nationality is required.');
+ }
+
$customer = new Customer();
$this->errors = array_merge($this->errors, $customer->validateFieldsRequiredDatabase());
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index a790be281..06a92e48b 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -161,7 +161,6 @@ class AdminImportControllerCore extends AdminController
$this->required_fields = array('id_hotel', 'name');
self::$validators['image'] = array('AdminImportController', 'split');
- self::$validators['id_additional_facilities'] = array('AdminImportController', 'split');
self::$validators['id_service_products'] = array('AdminImportController', 'split');
self::$validators['id_features'] = array('AdminImportController', 'split');
$this->available_fields = array(
@@ -194,7 +193,6 @@ class AdminImportControllerCore extends AdminController
'max_children' => array('label' => $this->l('Maximum children')),
'max_room_occupancy' => array('label' => $this->l('Maximum room occupancy')),
'show_at_front' => array('label' => $this->l('Show at front (0/1)')),
- 'id_additional_facilities' => array('label' => $this->l('Additional facilities IDs (x,y,z...)')),
'id_service_products' => array('label' => $this->l('Service products IDs (x, y, z...)')),
'id_features' => array('label' => $this->l('Feature IDs (x, y, z...)')),
'description_short' => array('label' => $this->l('Short description')),
@@ -285,7 +283,6 @@ class AdminImportControllerCore extends AdminController
case $this->entities[$this->l('Bookings')]:
$this->required_fields = array('id_customer', 'duration_dates', 'num_rooms', 'id_product');
self::$validators['duration_dates'] = array('AdminImportController', 'split');
- self::$validators['id_additional_facilities'] = array('AdminImportController', 'split');
self::$validators['id_service_products'] = array('AdminImportController', 'split');
$this->available_fields = array(
@@ -312,10 +309,6 @@ class AdminImportControllerCore extends AdminController
'label' => $this->l('Service Product IDs (x:n, y:n, z:n,..)'),
'help' => $this->l('id_service_product:quantity')
),
- 'id_additional_facilities' => array(
- 'label' => $this->l('Additional Facilities IDs (x:a, y:b, z:c,...)'),
- 'help' => $this->l('id_additional_facility:id_option')
- ),
);
break;
case $this->entities[$this->l('Customers')]:
@@ -1746,18 +1739,6 @@ class AdminImportControllerCore extends AdminController
}
$objHotelAdvancePayment->save();
- if (isset($product->id_additional_facilities) && $product->id_additional_facilities) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->deleteRoomTypeDemands($product->id);
- foreach ($product->id_additional_facilities as $idGlobalDemand) {
- if (Validate::isLoadedObject(new HotelRoomTypeGlobalDemand((int) $idGlobalDemand))) {
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $product->id;
- $objRoomTypeDemand->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemand->save();
- }
- }
- }
//delete existing images if "delete_existing_images" is set to 1
if (isset($product->delete_existing_images)) {
@@ -2558,7 +2539,6 @@ class AdminImportControllerCore extends AdminController
}
$serviceProducts = array();
- $globalDemands = array();
if (isset($orderProduct['id_service_products']) && count($orderProduct['id_service_products'])) {
foreach ($orderProduct['id_service_products'] as $serviceProdKey => $serviceProd) {
$serviceProd = explode(':', $serviceProd);
@@ -2579,28 +2559,6 @@ class AdminImportControllerCore extends AdminController
}
}
- if (isset($orderProduct['id_additional_facilities']) && count($orderProduct['id_additional_facilities'])) {
- foreach ($orderProduct['id_additional_facilities'] as $globalDemandKey => $globalDemand) {
- $globalDemand = explode(':', $globalDemand);
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($globalDemand[0], $this->context->language->id);
- if (Validate::isLoadedObject($objGlobalDemand)) {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- // incase no option is provided or if the provided id is not valid or the id is not connected to the diffrent option, we will set the first option as default.
- if ((!isset($globalDemand[1])
- || !Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($globalDemand[1])
- || $objAdvOption->id_global_demand != $globalDemand[0]))
- && ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($objGlobalDemand->id))
- ) {
- $globalDemand[1] = $advOptions[0]['id'];
- }
-
- $globalDemands[$globalDemandKey]['id_global_demand'] = $globalDemand[0];
- $globalDemands[$globalDemandKey]['id_option'] = isset($globalDemand[1]) ? $globalDemand[1] : 0;
- }
- }
- }
-
- $globalDemands = json_encode($globalDemands);
$objCartBooking->updateCartBooking(
$orderProduct['id_product'],
$occupancy,
@@ -2609,7 +2567,6 @@ class AdminImportControllerCore extends AdminController
0,
date('Y-m-d', strtotime($dateFrom)),
date('Y-m-d', strtotime($dateTo)),
- $globalDemands,
$serviceProducts,
$this->context->cart->id,
$this->context->cart->id_guest
@@ -3364,12 +3321,6 @@ class AdminImportControllerCore extends AdminController
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing_lang`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_feature_pricing_group`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_lang`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_global_demand_advance_option_lang`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_demand_price`');
- Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_demand`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_service_product_price`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'service_product_cart_detail`');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_type_restriction_date_range`');
@@ -3472,8 +3423,6 @@ class AdminImportControllerCore extends AdminController
'referrer_cache',
'htl_cart_booking_data',
'htl_booking_detail',
- 'htl_booking_demands',
- 'htl_booking_demands_tax',
'service_product_order_detail',
'service_product_cart_detail',
);
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 43838ccc8..2681ad61f 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -587,6 +587,12 @@ class AdminNormalProductsControllerCore extends AdminController
if ($this->_list) {
$context = $this->context->cloneContext();
$context->shop = clone($context->shop);
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $tourismTaxContext = $useTourismTax ? TaxConfiguration::resolveServiceLineTaxContext(
+ (int) Configuration::get('WK_PRIMARY_HOTEL'),
+ 0,
+ new Address(0)
+ ) : null;
/* update product final price */
for ($i = 0; $i < $nb; $i++) {
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP) {
@@ -598,6 +604,31 @@ class AdminNormalProductsControllerCore extends AdminController
$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null,
(int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, $nothing, true, true,
$context);
+
+ if ($useTourismTax) {
+ $unitPriceTaxExcl = Product::getPriceStatic($this->_list[$i]['id_product'], false, null,
+ 6, null, false, true, 1, true, null, null, null, $nothing, true, true,
+ $context);
+ $serviceTourismTaxAmount = 0.0;
+ $idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $this->_list[$i]['id_product']);
+ if ($idTourismTaxRulesGroup) {
+ $taxCalculator = TaxManagerFactory::getManager(
+ $tourismTaxContext['address'],
+ $idTourismTaxRulesGroup
+ )->getTaxCalculator();
+ $serviceTourismTaxAmount = $taxCalculator->getTaxesTotalAmount(
+ (float) $unitPriceTaxExcl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ $tourismTaxContext['collectionType'],
+ 1,
+ $this->context->currency->id
+ );
+ }
+ $this->_list[$i]['price_tmp'] += $serviceTourismTaxAmount;
+ }
}
}
@@ -3373,6 +3404,26 @@ class AdminNormalProductsControllerCore extends AdminController
// $data->assign('productFeaturePrices', $productFeaturePrices);
// }
+ if (Configuration::get('QLO_USE_TOURISM_TAX') && !Tax::excludeTaxeOption()) {
+ $tourismTaxRulesGroups = TaxRulesGroup::getTaxRulesGroupsForOptions(true, true);
+ $data->assign('tourismTaxRulesGroups', $tourismTaxRulesGroups);
+ $data->assign('id_tourism_tax_rules_group', isset($product->id_tourism_tax_rules_group) ? (int) $product->id_tourism_tax_rules_group : 0);
+
+ $tourismTaxRates = array();
+ foreach ($tourismTaxRulesGroups as $tourismTaxRulesGroup) {
+ $idTourismTaxRulesGroup = (int) $tourismTaxRulesGroup['id_tax_rules_group'];
+ if (!$idTourismTaxRulesGroup) {
+ continue;
+ }
+ $tourismTaxRates[$idTourismTaxRulesGroup] = TaxConfiguration::getPreviewParams(
+ $idTourismTaxRulesGroup,
+ $address,
+ (int) $this->context->language->id
+ );
+ }
+ $data->assign('tourismTaxRatesByGroup', $tourismTaxRates);
+ }
+
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 547110394..e39c5d6dd 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -33,6 +33,7 @@ class AdminOrdersControllerCore extends AdminController
protected $statuses_array = array();
protected $all_order_sources = array();
+ protected $bookingSourcesArray = array();
protected $hotelsArray = array();
protected $roomTypesArray = array();
protected $roomsArray = array();
@@ -75,6 +76,10 @@ class AdminOrdersControllerCore extends AdminController
(SELECT GROUP_CONCAT(CONCAT(ps.period, \'~\', ps.cnt) ORDER BY ps.period SEPARATOR \'::\') FROM (SELECT CONCAT(hbd.`date_from`, \'|\', hbd.`date_to`) AS period, COUNT(*) AS cnt FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = a.`id_order` GROUP BY hbd.`date_from`, hbd.`date_to`) AS ps) AS stay_periods,
(SELECT COUNT(spod.`id_service_product_order_detail`) FROM `'._DB_PREFIX_.'service_product_order_detail` spod WHERE spod.`id_order` = a.`id_order` AND spod.`id_htl_booking_detail`=0) as num_products';
+ $this->_select .= ',
+ (SELECT sl.`name` FROM `'._DB_PREFIX_.'source` s LEFT JOIN `'._DB_PREFIX_.'source_lang` sl ON (sl.`id_source` = s.`id_source` AND sl.`id_lang` = '.(int)$this->context->language->id.') WHERE s.`id_source` = a.`id_source`) AS `booking_source_name`,
+ (SELECT s.`code` FROM `'._DB_PREFIX_.'source` s WHERE s.`id_source` = a.`id_source`) AS `booking_source_code`';
+
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = a.`id_customer`)
LEFT JOIN `'._DB_PREFIX_.'currency` cu ON (cu.`id_currency` = a.`id_currency`)
@@ -114,6 +119,9 @@ class AdminOrdersControllerCore extends AdminController
foreach ($all_order_sources as $source) {
$this->all_order_sources[$source['source']] = $source['source'];
}
+ foreach (Source::getSourcesUsedInOrders((int)$this->context->language->id) as $bookingSource) {
+ $this->bookingSourcesArray[$bookingSource['id_source']] = $bookingSource['name'];
+ }
$hotelsArray = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1);
foreach ($hotelsArray as $hotel) {
@@ -280,6 +288,15 @@ class AdminOrdersControllerCore extends AdminController
'filter_key' => 'a!source',
'list' => $this->all_order_sources,
'optional' => true,
+ ),
+ 'booking_source_name' => array(
+ 'title' => $this->l('Booking Source'),
+ 'type' => 'select',
+ 'filter_key' => 'a!id_source',
+ 'list' => $this->bookingSourcesArray,
+ 'orderby' => false,
+ 'callback' => 'formatBookingSource',
+ 'optional' => true,
'visible_default' => true
),
'osname' => array(
@@ -369,6 +386,15 @@ class AdminOrdersControllerCore extends AdminController
return Tools::displayPrice($echo, (int)$idCurrency);
}
+ public function formatBookingSource($echo, $row)
+ {
+ if (!$echo) {
+ return '--';
+ }
+
+ return Tools::safeOutput($echo);
+ }
+
public function formatStayPeriods($value, $row)
{
if (empty($value)) {
@@ -484,6 +510,7 @@ class AdminOrdersControllerCore extends AdminController
if (!$cart_order_exists) {
$this->context->cart = $cart;
$this->context->currency = new Currency((int)$cart->id_currency);
+ $this->context->smarty->assign('info_icon_path', $this->context->link->getMediaLink(_MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icon-info.svg'));
$this->context->customer = new Customer((int)$cart->id_customer);
// validate cart for removing invalid data from cart before new order creation
// remove not linked services with room types from cart if not allowed to book them
@@ -567,6 +594,7 @@ class AdminOrdersControllerCore extends AdminController
'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
'occupancy_required_for_booking' => $occupancyRequiredForBooking,
+ 'booking_sources' => Source::getAllSource(true, (int)$this->context->language->id),
));
} else {
@@ -754,6 +782,7 @@ class AdminOrdersControllerCore extends AdminController
'current_index' => self::$currentIndex,
'order' => $objOrder,
'currencies' => $currencies,
+ 'currency' => new Currency($objOrder->id_currency),
'payment_methods' => $payment_methods,
'payment_types' => $objOrder->getPaymentsTypes(),
'invoices_collection' => $objOrder->getInvoicesCollection(),
@@ -956,6 +985,7 @@ class AdminOrdersControllerCore extends AdminController
'invoices_collection' => $objOrder->getInvoicesCollection(),
'currency' => new Currency($objOrder->id_currency),
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
+ 'use_tourism_tax' => (bool) Configuration::get('QLO_USE_TOURISM_TAX'),
)
);
$modal = array(
@@ -1011,37 +1041,9 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['id_booking_detail'] = $productLineData['id'];
- $objBookingDemand = new HotelBookingDemands();
-
// set context currency So that we can get prices in the order currency
$this->context->currency = $objCurrency;
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- 0,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1,
- $productLineData['id']
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- $smartyVars['roomTypeDemands'] = $roomTypeDemands;
- }
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -1061,7 +1063,7 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['additionalServices'] = $additionalServices[$productLineData['id']];
}
- // get room type additional demands
+ // get room type extra services
if (Configuration::get('PS_ALLOW_ADD_ALL_SERVICES_IN_BOOKING')) {
// get all services
$objProduct = new Product();
@@ -1104,7 +1106,7 @@ class AdminOrdersControllerCore extends AdminController
}
}
-
+
$smartyVars['serviceProducts'] = $serviceProducts;
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1);
@@ -1157,33 +1159,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1, 0, 1);
if ($bookingOrderInfo = $objBookingDetail->getBookingDataByOrderId($objOrder->id)) {
- $objBookingDemand = new HotelBookingDemands();
foreach($bookingOrderInfo as $key => $booking) {
if ((in_array($booking['id'], $refundReqBookings)) || $booking['is_refunded']) {
unset($bookingOrderInfo[$key]);
} else {
- $bookingOrderInfo[$key]['total_price_tax_incl'] += $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 1,
- 1,
- $booking['id']
- );
- $bookingOrderInfo[$key]['total_price_tax_excl'] += $objBookingDemand->getRoomTypeBookingExtraDemands(
- $objOrder->id,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 1,
- 0,
- $booking['id']
- );
$bookingOrderInfo[$key]['total_price_tax_incl'] += $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
0,
@@ -2245,6 +2224,14 @@ class AdminOrdersControllerCore extends AdminController
$advancePaymentAmount = $objCart->getOrderTotal(true, Cart::ADVANCE_PAYMENT);
}
+ $idBookingSource = (int)Tools::getValue('id_booking_source');
+ if ($idBookingSource) {
+ $objBookingSource = new Source($idBookingSource);
+ if (!Validate::isLoadedObject($objBookingSource) || !$objBookingSource->active) {
+ $this->errors[] = Tools::displayError('Please select a valid Booking Source.');
+ }
+ }
+
// Validate data if required
if ($orderTotal > 0) {
$moduleName = trim(Tools::getValue('payment_module_name'));
@@ -2265,15 +2252,13 @@ class AdminOrdersControllerCore extends AdminController
$paymentAmount = $orderTotal;
}
- if ($paymentAmount >= 0) {
+ if ($paymentAmount > 0) {
if (!$moduleName) {
$this->errors[] = Tools::displayError('Please enter Payment method.');
} elseif ($moduleName && !Validate::isGenericName($moduleName)) {
$this->errors[] = Tools::displayError('Payment method is invalid. Please enter a valid payment method.');
}
- }
- if ($paymentAmount > 0) {
if (!$paymentType) {
$this->errors[] = Tools::displayError('Please select a Payment source.');
} elseif ($paymentType && !Validate::isUnsignedInt($paymentType)) {
@@ -2290,10 +2275,14 @@ class AdminOrdersControllerCore extends AdminController
// Set payment module details
$objPaymentModule = new BoOrder();
- $objPaymentModule->displayName = $moduleName;
+ if ($moduleName) {
+ $objPaymentModule->displayName = $moduleName;
+ }
if ($orderTotal > 0) {
- $objPaymentModule->payment_type = $paymentType;
+ if ($paymentType) {
+ $objPaymentModule->payment_type = $paymentType;
+ }
// Set order state
if ($isFullPayment) {
@@ -2333,6 +2322,10 @@ class AdminOrdersControllerCore extends AdminController
$extraVars = null;
}
+ if ($idBookingSource) {
+ $objPaymentModule->idBookingSource = $idBookingSource;
+ }
+
$amountPaid = Tools::ps_round($amountPaid, 6);
$objEmployee = new Employee($this->context->cookie->id_employee);
$sendMails = Tools::getValue('send_mails', true);
@@ -2514,44 +2507,6 @@ class AdminOrdersControllerCore extends AdminController
}
}
- // update rooms bookings demands (htl_booking_demands)
- $objBookingDemand = new HotelBookingDemands();
- if ($orderBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands($order->id, 0, 0, 0, 0, 0)) {
- $fields = array(
- 'unit_price_tax_excl',
- 'unit_price_tax_incl',
- 'total_price_tax_excl',
- 'total_price_tax_incl',
- );
-
- $vatAddress = new Address((int)$order->id_address_tax);
- $idLang = (int) $order->id_lang;
- foreach ($orderBookingDemands as $bookingDemand) {
- $objBookingDemand = new HotelBookingDemands($bookingDemand['id_booking_demand']);
- foreach ($fields as $field) {
- $objBookingDemand->{$field} = Tools::convertPriceFull(
- $objBookingDemand->{$field},
- $old_currency,
- $currency
- );
- }
-
- // update Tax of bookings demands
- if ($objBookingDemand->save()) {
- $taxManager = TaxManagerFactory::getManager(
- $vatAddress,
- $objBookingDemand->id_tax_rules_group
- );
- $taxCalculator = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalculator->computation_method;
- $objBookingDemand->tax_calculator = $taxCalculator;
-
- // Now save tax details of the extra demand with replace = 1
- $objBookingDemand->setBookingDemandTaxDetails(1);
- }
- }
- }
-
$fields = array(
'unit_price_tax_excl',
'unit_price_tax_incl',
@@ -2713,6 +2668,10 @@ class AdminOrdersControllerCore extends AdminController
_PS_PRICE_COMPUTE_PRECISION_
);
$order->update();
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
}
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token);
@@ -2881,6 +2840,11 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
+
+ $loopOrderInvoice = new OrderInvoice((int) $id_order_invoice);
+ if (Validate::isLoadedObject($loopOrderInvoice)) {
+ $loopOrderInvoice->recomputeTotalsFromLines();
+ }
}
// Update Order
@@ -3067,12 +3031,25 @@ class AdminOrdersControllerCore extends AdminController
$helper->id = 'box-order-source';
$helper->icon = 'icon-globe';
$helper->color = 'color1';
+ $helper->visible = false;
$helper->title = $this->l('Order Source');
$helper->tooltip = $this->l('Order source shows from which source the order was placed.');
$helper->subtitle = $orderHistory[0]['id_employee'] ? $this->l('Back office') : $this->l('Front office');
$helper->value = $objOrder->source;
$this->kpis[] = $helper;
+ $objBookingSource = new Source((int)$objOrder->id_source, $this->context->language->id);
+ if (Validate::isLoadedObject($objBookingSource)) {
+ $helper = new HelperKpi();
+ $helper->id = 'box-booking-source';
+ $helper->icon = 'icon-tag';
+ $helper->color = 'color2';
+ $helper->title = $this->l('Booking Source');
+ $helper->tooltip = $this->l('Booking source shows the source from which this booking originated, e.g. Walk-in, Website, OTA.');
+ $helper->value = $objBookingSource->name;
+ $this->kpis[] = $helper;
+ }
+
$objCustomerThread = new CustomerThread();
$idCustomerThread = $objCustomerThread->getIdCustomerThreadByIdOrder($objOrder->id);
$helper = new HelperKpi();
@@ -3404,6 +3381,9 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$orderHotelServiceProducts = array();
$orderStandaloneServiceProducts = array();
+ $standaloneServiceTourismTaxStatusMap = Configuration::get('QLO_USE_TOURISM_TAX')
+ ? OrderTaxDetail::getStandaloneServiceTourismTaxStatuses($order->id)
+ : array();
// products current stock (from stock_available)
foreach ($products as &$product) {
// Get total customized quantity for current product
@@ -3452,12 +3432,38 @@ class AdminOrdersControllerCore extends AdminController
if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
$hotelProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($order->id, $product['id_order_detail'], $product['product_id'], Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
foreach ($hotelProducts as $hotelProduct) {
+ $tourismTaxStatus = isset($standaloneServiceTourismTaxStatusMap[$hotelProduct['id_service_product_order_detail']])
+ ? $standaloneServiceTourismTaxStatusMap[$hotelProduct['id_service_product_order_detail']]
+ : null;
+ if ($tourismTaxStatus) {
+ $hotelProduct['tourism_tax_status'] = $tourismTaxStatus['status'];
+ } else {
+ $hotelProduct['tourism_tax_status'] = Product::getIdTourismTaxRulesGroupByIdProduct((int) $hotelProduct['id_product'])
+ ? OrderTaxDetail::STATUS_NONE
+ : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+ $hotelProduct['tourism_tax_total'] = $tourismTaxStatus ? $tourismTaxStatus['total'] : 0.0;
+ $hotelProduct['total_service_tax'] = $hotelProduct['total_price_tax_incl'] - $hotelProduct['total_price_tax_excl'];
+ $hotelProduct['total_service_tax_only'] = $hotelProduct['total_service_tax'] - $hotelProduct['tourism_tax_total'];
$orderHotelServiceProducts[] = array_merge($product, $hotelProduct);
}
}
if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
$standaloneProducts = $objServiceProductOrderDetail->getServiceProductsInOrder($order->id, $product['id_order_detail'], $product['product_id'], Product::SELLING_PREFERENCE_STANDALONE);
foreach ($standaloneProducts as $standaloneProduct) {
+ $tourismTaxStatus = isset($standaloneServiceTourismTaxStatusMap[$standaloneProduct['id_service_product_order_detail']])
+ ? $standaloneServiceTourismTaxStatusMap[$standaloneProduct['id_service_product_order_detail']]
+ : null;
+ if ($tourismTaxStatus) {
+ $standaloneProduct['tourism_tax_status'] = $tourismTaxStatus['status'];
+ } else {
+ $standaloneProduct['tourism_tax_status'] = Product::getIdTourismTaxRulesGroupByIdProduct((int) $standaloneProduct['id_product'])
+ ? OrderTaxDetail::STATUS_NONE
+ : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+ $standaloneProduct['tourism_tax_total'] = $tourismTaxStatus ? $tourismTaxStatus['total'] : 0.0;
+ $standaloneProduct['total_service_tax'] = $standaloneProduct['total_price_tax_incl'] - $standaloneProduct['total_price_tax_excl'];
+ $standaloneProduct['total_service_tax_only'] = $standaloneProduct['total_service_tax'] - $standaloneProduct['tourism_tax_total'];
$orderStandaloneServiceProducts[] = array_merge($product, $standaloneProduct);
}
}
@@ -3487,52 +3493,18 @@ class AdminOrdersControllerCore extends AdminController
$total_room_tax = 0;
$totalRoomsCostTE = 0;
- $totalDemandsPriceTE = 0;
- $totalDemandsPriceTI = 0;
$totalRefundedRooms = 0;
$orderConvenienceFeeServices = array();
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $bookingTourismTaxStatusMap = OrderTaxDetail::getAppliedTourismTaxTotals($order->id, OrderTaxDetail::SCOPE_ROOM_STATUS);
+ $serviceTourismTaxMap = OrderTaxDetail::getAppliedTourismTaxTotals($order->id, OrderTaxDetail::SCOPE_SERVICE);
if ($order_detail_data = $objBookingDetail->getOrderFormatedBookinInfoByIdOrder($order->id)) {
- $objBookingDemand = new HotelBookingDemands();
$objHotelRoomType = new HotelRoomType();
foreach ($order_detail_data as $key => $value) {
$order_detail_data[$key]['total_room_price_te'] = $value['total_price_tax_excl'];
$order_detail_data[$key]['total_room_price_ti'] = $value['total_price_tax_incl'];
-
- $order_detail_data[$key]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 1,
- 0,
- 1,
- $value['id']
- );
- $order_detail_data[$key]['total_room_price_ti'] += $order_detail_data[$key]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 0,
- 1,
- 1,
- $value['id']
- );
- $totalDemandsPriceTI += $order_detail_data[$key]['extra_demands_price_ti'];
- $order_detail_data[$key]['total_room_price_te'] += $order_detail_data[$key]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $order->id,
- $value['id_product'],
- $value['id_room'],
- $value['date_from'],
- $value['date_to'],
- 0,
- 1,
- 0,
- $value['id']
- );
- $totalDemandsPriceTE += $order_detail_data[$key]['extra_demands_price_te'];
+ $bookingTourismTaxAmount = isset($bookingTourismTaxStatusMap[$value['id']]) ? (float) $bookingTourismTaxStatusMap[$value['id']]['total'] : 0.0;
+ $order_detail_data[$key]['tourism_tax_amount'] = $bookingTourismTaxAmount;
$order_detail_data[$key]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -3666,7 +3638,7 @@ class AdminOrdersControllerCore extends AdminController
/*Product price when order was created*/
$totalRoomsCostTE += $value['total_price_tax_excl'];
- $total_room_tax += $value['total_price_tax_incl']-$value['total_price_tax_excl'];
+ $total_room_tax += ($value['total_price_tax_incl'] - $value['total_price_tax_excl']);
$num_days = HotelHelper::getNumberOfDays($value['date_from'], $value['date_to']);
$order_detail_data[$key]['unit_amt_tax_excl'] = $value['total_price_tax_excl']/$num_days;
$order_detail_data[$key]['unit_amt_tax_incl'] = $value['total_price_tax_incl']/$num_days;
@@ -3674,6 +3646,12 @@ class AdminOrdersControllerCore extends AdminController
$order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl'];
$order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']);
$order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te'];
+ $bookingTourismTaxStatus = isset($bookingTourismTaxStatusMap[$value['id']]) ? $bookingTourismTaxStatusMap[$value['id']] : null;
+ $roomTourismTaxTotal = $bookingTourismTaxStatus ? $bookingTourismTaxStatus['total'] : 0.0;
+ $serviceTourismTaxTotal = isset($serviceTourismTaxMap[$value['id']]) ? $serviceTourismTaxMap[$value['id']] : 0.0;
+ $order_detail_data[$key]['tourism_tax_status'] = self::combinedRoomTourismTaxStatus($value['id'], $value['id_product'], $bookingTourismTaxStatus, $serviceTourismTaxTotal);
+ $order_detail_data[$key]['tourism_tax_total'] = $roomTourismTaxTotal + $serviceTourismTaxTotal;
+ $order_detail_data[$key]['total_room_service_tax_only'] = $order_detail_data[$key]['total_room_tax'] - $roomTourismTaxTotal - $serviceTourismTaxTotal;
$order_detail_data[$key]['num_checkin_documents'] = HotelBookingDocument::getCountByIdHtlBooking($value['id']);
$order_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms($value['id_room'], null, null, (int) Context::getContext()->language->id);
@@ -3690,6 +3668,40 @@ class AdminOrdersControllerCore extends AdminController
$order_detail_data = array();
}
+ $orderTourismTaxHasApplied = false;
+ $orderTourismTaxHasUnapplied = false;
+ if ($useTourismTax && $order_detail_data) {
+ foreach ($order_detail_data as $bookingRow) {
+ if (!empty($bookingRow['is_cancelled']) || !empty($bookingRow['is_refunded'])) {
+ continue;
+ }
+ if (isset($bookingRow['tourism_tax_status'])) {
+ if ($bookingRow['tourism_tax_status'] === OrderTaxDetail::STATUS_APPLIED) {
+ $orderTourismTaxHasApplied = true;
+ } elseif ($bookingRow['tourism_tax_status'] !== OrderTaxDetail::STATUS_NOT_APPLICABLE) {
+ $orderTourismTaxHasUnapplied = true;
+ }
+ }
+ }
+ }
+
+ $productsTourismTaxHasApplied = false;
+ $productsTourismTaxHasUnapplied = false;
+ if ($useTourismTax) {
+ foreach (array_merge($orderHotelServiceProducts, $orderStandaloneServiceProducts) as $productRow) {
+ if (!empty($productRow['is_cancelled']) || !empty($productRow['is_refunded'])) {
+ continue;
+ }
+ if (isset($productRow['tourism_tax_status'])) {
+ if ($productRow['tourism_tax_status'] === OrderTaxDetail::STATUS_APPLIED) {
+ $productsTourismTaxHasApplied = true;
+ } elseif ($productRow['tourism_tax_status'] !== OrderTaxDetail::STATUS_NOT_APPLICABLE) {
+ $productsTourismTaxHasUnapplied = true;
+ }
+ }
+ }
+ }
+
if ($orderedRooms = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$order->id,
0,
@@ -3813,13 +3825,22 @@ class AdminOrdersControllerCore extends AdminController
'refundReqBookings' => $refundReqBookings,
'refundReqProducts' => $refundReqProducts,
'refundedAmount' => $refundedAmount,
- 'totalDemandsPriceTI' => $totalDemandsPriceTI,
- 'totalDemandsPriceTE' => $totalDemandsPriceTE,
'totalRoomsCostTE' => $totalRoomsCostTE,
'total_room_tax' => $total_room_tax,
'htl_booking_order_data' => $bookingOrderInfo,
'hotel_order_status' => $htlOrderStatus,
'order_detail_data' => $order_detail_data,
+ 'use_tourism_tax' => $useTourismTax,
+ 'tourism_tax_room' => array_sum(array_column($bookingTourismTaxStatusMap, 'total')),
+ 'tourism_tax_service' => array_sum($serviceTourismTaxMap),
+ 'tourism_tax_products' => array_sum(array_column($standaloneServiceTourismTaxStatusMap, 'total')),
+ 'info_icon_path' => $this->context->link->getMediaLink(_MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icon-info.svg'),
+ 'tourism_tax_status_applied' => OrderTaxDetail::STATUS_APPLIED,
+ 'tourism_tax_status_not_applicable' => OrderTaxDetail::STATUS_NOT_APPLICABLE,
+ 'order_tourism_tax_has_applied' => $orderTourismTaxHasApplied,
+ 'order_tourism_tax_has_unapplied' => $orderTourismTaxHasUnapplied,
+ 'products_tourism_tax_has_applied' => $productsTourismTaxHasApplied,
+ 'products_tourism_tax_has_unapplied' => $productsTourismTaxHasUnapplied,
'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
'hotel_service_products' => $orderHotelServiceProducts,
'standalone_service_products' => $orderStandaloneServiceProducts,
@@ -4306,21 +4327,23 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOption = new ServiceProductOption();
foreach ($products as $key => &$product) {
$idHotelAddress = Cart::getIdAddressForTaxCalculation($product['id_product'], $idHotel);
- $product['price_tax_incl'] = RoomTypeServiceProductPrice::getPrice($product['id_product'], $idHotel, null, true);
- $product['price_tax_excl'] = RoomTypeServiceProductPrice::getPrice($product['id_product'], $idHotel, null, false);
+ $product['price_tax_incl'] = Product::getServiceProductPrice($product['id_product'], null, $idHotel, false, true);
+ $product['price_tax_excl'] = Product::getServiceProductPrice($product['id_product'], null, $idHotel, false, false);
// if product has options then set the price of the first selected option of the product
if ($product['options'] = $objServiceProductOption->getProductOptions($product['id_product'])) {
- $product['price_tax_incl'] = RoomTypeServiceProductPrice::getPrice(
+ $product['price_tax_incl'] = Product::getServiceProductPrice(
$product['id_product'],
- $idHotel,
$product['options'][0]['id_product_option'],
+ $idHotel,
+ false,
true
);
- $product['price_tax_excl'] = RoomTypeServiceProductPrice::getPrice(
+ $product['price_tax_excl'] = Product::getServiceProductPrice(
$product['id_product'],
- $idHotel,
$product['options'][0]['id_product_option'],
+ $idHotel,
+ false,
false
);
}
@@ -4442,8 +4465,8 @@ class AdminOrdersControllerCore extends AdminController
$currency = new Currency((int)$order->id_currency);
if ($idHotel = $addressTax->id_hotel) {
if ($id_product_option = $addProduct['product_option']) {
- $price_tax_incl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], $idHotel, $id_product_option, true);
- $price_tax_excl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], $idHotel, $id_product_option, false);
+ $price_tax_incl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, $idHotel, false, true);
+ $price_tax_excl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, $idHotel, false, false);
// convert price to order currency
$price_tax_excl = Tools::ps_round(Tools::convertPrice($price_tax_excl, $currency), _PS_PRICE_COMPUTE_PRECISION_);
@@ -4457,8 +4480,8 @@ class AdminOrdersControllerCore extends AdminController
}
} else {
if ($id_product_option = $addProduct['product_option']) {
- $price_tax_incl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], false, $id_product_option, true);
- $price_tax_excl = RoomTypeServiceProductPrice::getPrice($addProduct['product_id'], false, $id_product_option, false);
+ $price_tax_incl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, false, false, true);
+ $price_tax_excl = Product::getServiceProductPrice($addProduct['product_id'], $id_product_option, false, false, false);
// convert price to order currency
$price_tax_excl = Tools::ps_round(Tools::convertPrice($price_tax_excl, $currency), _PS_PRICE_COMPUTE_PRECISION_);
@@ -4744,6 +4767,7 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
+ $order_invoice->recomputeTotalsFromLines();
$order->total_shipping = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_incl = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_excl = $order_invoice->total_shipping_tax_excl;
@@ -5324,6 +5348,7 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($order_invoice) && Validate::isLoadedObject($order_invoice)) {
+ $order_invoice->recomputeTotalsFromLines();
$order->total_shipping = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_incl = $order_invoice->total_shipping_tax_incl;
$order->total_shipping_tax_excl = $order_invoice->total_shipping_tax_excl;
@@ -5465,6 +5490,7 @@ class AdminOrdersControllerCore extends AdminController
$this->context->cart->id_guest,
$idProduct
)) {
+ $useTourismTaxForNewBooking = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
foreach ($cartBookingData as $cb_k => $cb_v) {
$objCartBookingData = new HotelCartBookingData($cb_v['id']);
$objCartBookingData->id_order = $order->id;
@@ -5539,6 +5565,56 @@ class AdminOrdersControllerCore extends AdminController
}
if ($objBookingDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objBookingDetail->id_order_detail, (int) $objBookingDetail->id, 0);
+
+ if ($useTourismTaxForNewBooking) {
+ $idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct);
+ if ($idTourismTaxRulesGroup) {
+ $tourismTaxAddress = null;
+ if ($objCartBookingData->id_hotel) {
+ $hotelAddress = HotelBranchInformation::getAddress($objCartBookingData->id_hotel);
+ if ($hotelAddress && !empty($hotelAddress['id_address'])) {
+ $tourismTaxAddress = new Address((int) $hotelAddress['id_address']);
+ }
+ }
+ if (!$tourismTaxAddress || !Validate::isLoadedObject($tourismTaxAddress)) {
+ $tourismTaxAddress = new Address((int) Cart::getIdAddressForTaxCalculation($idProduct));
+ }
+
+ $tourismTaxNumNights = max(1, (int) HotelHelper::getNumberOfDays($objBookingDetail->date_from, $objBookingDetail->date_to));
+ $tourismTaxChildAges = array();
+ if ($objBookingDetail->child_ages) {
+ $decodedChildAges = json_decode($objBookingDetail->child_ages, true);
+ if (is_array($decodedChildAges)) {
+ $tourismTaxChildAges = array_map('intval', $decodedChildAges);
+ }
+ }
+ $tourismTaxCollectionType = Validate::isLoadedObject($objHotelBranch)
+ ? (int) $objHotelBranch->tourism_tax_collection_type
+ : HotelBranchInformation::TAX_COLLECTION_TYPE_ONLINE;
+
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxAddress,
+ (float) $objBookingDetail->total_price_tax_excl / $tourismTaxNumNights,
+ $objBookingDetail->date_from,
+ $tourismTaxNumNights,
+ (int) $objBookingDetail->adults,
+ $tourismTaxChildAges,
+ (int) $this->context->cart->id_currency,
+ $tourismTaxCollectionType,
+ $idLang,
+ 1,
+ $order->id,
+ (int) $objBookingDetail->id_order_detail,
+ $objBookingDetail->id,
+ 0
+ );
+ // Whether the checkbox exempts this room+its services is decided once,
+ // after the auto-attached service loop below runs — see there for why.
+ }
+ }
+
$objRoomTypeServiceProduct = new RoomTypeServiceProduct();
$objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
$objServiceProductCartDetail = new ServiceProductCartDetail();
@@ -5614,13 +5690,52 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->total_price_tax_incl = $totalPriceTaxIncl;
$objServiceProductOrderDetail->name = $service['name'];
$objServiceProductOrderDetail->quantity = 1;
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if ($useTourismTaxForNewBooking) {
+ $idServiceTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct((int) $service['id_product']);
+ if ($idServiceTourismTaxRulesGroup) {
+ $serviceTourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(
+ (int) $objCartBookingData->id_hotel,
+ $objBookingDetail->id,
+ new Address((int) Cart::getIdAddressForTaxCalculation((int) $service['id_product']))
+ );
+ OrderTaxDetail::saveTourismTax(
+ $idServiceTourismTaxRulesGroup,
+ $serviceTourismTaxContext['address'],
+ $unitPriceTaxExcl,
+ $serviceTourismTaxContext['checkInDate'],
+ $serviceTourismTaxContext['numNights'],
+ $serviceTourismTaxContext['numAdults'],
+ $serviceTourismTaxContext['childrenAges'],
+ (int) $this->context->cart->id_currency,
+ $serviceTourismTaxContext['collectionType'],
+ $idLang,
+ 1,
+ $order->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
+ }
}
}
+
+ if ($useTourismTaxForNewBooking && empty($product_informations['apply_tourism_tax'])) {
+ OrderTaxDetail::exemptBooking($objBookingDetail->id);
+ }
}
}
}
+ $order->total_paid = $order->getOrderTotal();
+ $order->total_paid_tax_incl = $order->total_paid;
+ $order->total_paid_tax_excl = $order->getOrderTotal(false);
+ $order->update();
+
// delete cart feature prices after room addition success
HotelRoomTypeFeaturePricing::deleteFeaturePrices($this->context->cart->id);
@@ -5873,6 +5988,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
if (isset($objOrderInvoice) && Validate::isLoadedObject($objOrderInvoice)) {
+ $objOrderInvoice->recomputeTotalsFromLines();
$objOrder->total_shipping = $objOrderInvoice->total_shipping_tax_incl;
$objOrder->total_shipping_tax_incl = $objOrderInvoice->total_shipping_tax_incl;
$objOrder->total_shipping_tax_excl = $objOrderInvoice->total_shipping_tax_excl;
@@ -5921,9 +6037,43 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->hotel_name = $objHotelBranch->hotel_name;
}
}
- $objServiceProductOrderDetail->save();
+ if ($objServiceProductOrderDetail->save()) {
+ OrderTaxDetail::updateVatScoping((int) $objServiceProductOrderDetail->id_order_detail, 0, (int) $objServiceProductOrderDetail->id);
+
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($idTourismTaxRulesGroup = Product::getIdTourismTaxRulesGroupByIdProduct($idProduct))
+ ) {
+ $tourismTaxContext = TaxConfiguration::resolveServiceLineTaxContext(
+ $objServiceProductOrderDetail->id_hotel,
+ 0,
+ new Address((int) Cart::getIdAddressForTaxCalculation($idProduct))
+ );
+ OrderTaxDetail::saveTourismTax(
+ $idTourismTaxRulesGroup,
+ $tourismTaxContext['address'],
+ (float) $objServiceProductOrderDetail->unit_price_tax_excl,
+ $tourismTaxContext['checkInDate'],
+ $tourismTaxContext['numNights'],
+ $tourismTaxContext['numAdults'],
+ $tourismTaxContext['childrenAges'],
+ (int) $objOrder->id_currency,
+ $tourismTaxContext['collectionType'],
+ (int) $objOrder->id_lang,
+ (int) $objServiceProductOrderDetail->quantity,
+ $objOrder->id,
+ (int) $objServiceProductOrderDetail->id_order_detail,
+ 0,
+ (int) $objServiceProductOrderDetail->id
+ );
+ }
+ }
}
+ $objOrder->total_paid = $objOrder->getOrderTotal();
+ $objOrder->total_paid_tax_incl = $objOrder->total_paid;
+ $objOrder->total_paid_tax_excl = $objOrder->getOrderTotal(false);
+ $objOrder->update();
+
$response['status'] = true;
} else {
$response['status'] = false;
@@ -6162,9 +6312,6 @@ class AdminOrdersControllerCore extends AdminController
$order_detail->product_quantity = $old_quantity + $qty_diff;
$order_detail->reduction_percent = 0;
- // update taxes
- $res &= $order_detail->updateTaxAmount($order);
-
// Save order detail
$res &= $order_detail->update();
@@ -6245,8 +6392,6 @@ class AdminOrdersControllerCore extends AdminController
)));
}
- // get extra demands of the room before changing in the booking table
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$orderServiceProducts = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$id_order,
@@ -6264,18 +6409,6 @@ class AdminOrdersControllerCore extends AdminController
$obj_booking_detail->id
);
- $extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- 0,
- $id_room,
- $old_date_from,
- $old_date_to,
- 1,
- 0,
- 1,
- $obj_booking_detail->id
- );
-
// set occupancy details
$occupancy = array(
'adults' => $adults,
@@ -6300,46 +6433,7 @@ class AdminOrdersControllerCore extends AdminController
$new_total_price,
$obj_booking_detail->id
)) {
- // update extra demands total prices if dates are changes (price calc method for each day)
- if ($extraDemands) {
- foreach ($extraDemands as $demand) {
- if (isset($demand['extra_demands']) && $demand['extra_demands']) {
- foreach ($demand['extra_demands'] as $rDemand) {
- if ($rDemand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $objBookingDemand = new HotelBookingDemands($rDemand['id_booking_demand']);
-
- $numDays = HotelHelper::getNumberOfDays($new_date_from, $new_date_to);
- $demandPriceTE = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $demandPriceTI = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
-
- $objBookingDemand->total_price_tax_excl = $demandPriceTE;
- $objBookingDemand->total_price_tax_incl = $demandPriceTI;
-
- $objBookingDemand->save();
-
- if (isset($order_invoice)) {
- $order_invoice->total_paid_tax_excl -= $rDemand['total_price_tax_excl'];
- $order_invoice->total_paid_tax_incl -= $rDemand['total_price_tax_incl'];
-
- $order_invoice->total_paid_tax_excl += (float)$objBookingDemand->total_price_tax_excl;
- $order_invoice->total_paid_tax_incl += (float)$objBookingDemand->total_price_tax_incl;
- }
- }
- }
- }
- }
-
- }
+ $res &= $order_detail->updateTaxAmount($order);
if (isset($orderServiceProducts)
&& is_array($orderServiceProducts)
@@ -6391,7 +6485,6 @@ class AdminOrdersControllerCore extends AdminController
$objOrderDetail->save();
$this->context->cart = new Cart($objServiceProductOrderDetail->id_cart);
- $objOrderDetail->updateTaxAmount($order);
if (isset($order_invoice)) {
$order_invoice->total_paid_tax_excl -= $objServiceProductOrderDetail->total_price_tax_excl;
@@ -6405,16 +6498,68 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->total_price_tax_excl = $newTotalPriceTaxExcl;
$objServiceProductOrderDetail->total_price_tax_incl = $newTotalPriceTaxIncl;
$objServiceProductOrderDetail->save();
+
+ $objOrderDetail->updateTaxAmount($order);
}
}
}
}
}
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $roomTourismTaxParams = OrderTaxDetail::buildRoomTaxParams((int) $obj_booking_detail->id);
+ if ($roomTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $roomTourismTaxParams['idTaxRulesGroup'],
+ $roomTourismTaxParams['address'],
+ $roomTourismTaxParams['unitPriceTaxExcl'],
+ $roomTourismTaxParams['checkInDate'],
+ $roomTourismTaxParams['numNights'],
+ $roomTourismTaxParams['numAdults'],
+ $roomTourismTaxParams['childrenAges'],
+ $roomTourismTaxParams['idCurrency'],
+ $roomTourismTaxParams['collectionType'],
+ $roomTourismTaxParams['idLang'],
+ $roomTourismTaxParams['quantity'],
+ $roomTourismTaxParams['idOrder'],
+ $roomTourismTaxParams['idOrderDetail'],
+ $roomTourismTaxParams['idHtlBooking'],
+ $roomTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail((int) $obj_booking_detail->id) as $idActiveServiceLine) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams($idActiveServiceLine);
+ if (!$serviceTourismTaxParams) {
+ continue;
+ }
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
}
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
if($order->save()){
$roomType = Product::getProductName($id_product, null, $this->context->language->id);
$oldDateFromFormatted = date('d/m/Y', strtotime($old_date_from));
@@ -6536,15 +6681,11 @@ class AdminOrdersControllerCore extends AdminController
}
$objOrderDetail->total_price_tax_incl += $diffPriceTaxIncl;
$objOrderDetail->total_price_tax_excl += $diffPriceTaxExcl;
+ $objOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl;
+ $objOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl;
$objOrderDetail->product_quantity += $updateQty;
$objOrderDetail->reduction_percent = 0;
- // update taxes
- $result &= $objOrderDetail->updateTaxAmount($objOrder);
-
- // Save order detail
- $result &= $objOrderDetail->update();
-
$objServiceProductOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl;
$objServiceProductOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl;
$objServiceProductOrderDetail->total_price_tax_excl = $totalProductsTaxExcl;
@@ -6552,6 +6693,35 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->quantity += $updateQty;
$result &= $objServiceProductOrderDetail->update();
+ // update taxes
+ $result &= $objOrderDetail->updateTaxAmount($objOrder);
+
+ // Save order detail
+ $result &= $objOrderDetail->update();
+
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id);
+ if ($serviceTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
+
// Apply changes on Order
$objOrder = new Order($objOrderDetail->id_order);
$objOrder->total_products += $diffPriceTaxExcl;
@@ -6571,6 +6741,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += $diffPriceTaxExcl;
$objOrderInvoice->total_paid_tax_incl += $diffPriceTaxIncl;
$result &= $objOrderInvoice->update();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// Update product available quantity
@@ -6631,30 +6802,6 @@ class AdminOrdersControllerCore extends AdminController
$bookingPriceTaxIncl = Tools::processPriceRounding($objBookingDetail->total_price_tax_incl, 1, $order->round_type, $order->round_mode);
$bookingPriceTaxExcl = Tools::processPriceRounding($objBookingDetail->total_price_tax_excl, 1, $order->round_type, $order->round_mode);
- $objBookingDemand = new HotelBookingDemands();
- $roomExtraDemandTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $objBookingDetail->id_product,
- $objBookingDetail->id_room,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- 0,
- 1,
- 1,
- $objBookingDetail->id
- );
- $roomExtraDemandTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $objBookingDetail->id_product,
- $objBookingDetail->id_room,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- 0,
- 1,
- 0,
- $objBookingDetail->id
- );
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$additionlServicesTI = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -6795,10 +6942,8 @@ class AdminOrdersControllerCore extends AdminController
if ($order_detail->id_order_invoice != 0) {
// values changes as values are calculated accoding to the quantity of the product by webkul
$order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl -= ($diff_products_tax_excl + $roomExtraDemandTE + $additionlServicesTE);
$order_invoice->total_paid_tax_excl = $order_invoice->total_paid_tax_excl > 0 ? $order_invoice->total_paid_tax_excl : 0;
-
- $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $roomExtraDemandTI + $additionlServicesTI);
+ $order_invoice->total_paid_tax_incl -= ($diff_products_tax_incl + $additionlServicesTI);
$order_invoice->total_paid_tax_incl = $order_invoice->total_paid_tax_incl > 0 ? $order_invoice->total_paid_tax_incl : 0;
$order_invoice->total_products -= $diff_products_tax_excl;
@@ -6816,8 +6961,8 @@ class AdminOrdersControllerCore extends AdminController
// Update Order
// values changes as values are calculated accoding to the quantity of the product by webkul
$order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal() - $roomExtraDemandTI, _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false) - $roomExtraDemandTE, _PS_PRICE_COMPUTE_PRECISION_);
+ $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
+ $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_products -= ($diff_products_tax_excl + $additionlServicesTE);
$order->total_products = $order->total_products > 0 ? $order->total_products : 0;
@@ -6854,8 +6999,10 @@ class AdminOrdersControllerCore extends AdminController
$invoice_array[] = $invoice;
}
- // delete the demands od this booking
- $objBookingDemand->deleteBookingDemands($idHotelBooking);
+ OrderTaxDetail::hardDeleteForBooking(
+ $idHotelBooking,
+ ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail($idHotelBooking)
+ );
$objServiceProductOrderDetail->deleteSeviceProducts(0, $idHotelBooking);
@@ -6922,6 +7069,10 @@ class AdminOrdersControllerCore extends AdminController
$order->update();
}
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
+
// Assign to smarty informations in order to show the new product line
$this->context->smarty->assign(array(
'order' => $order,
@@ -7014,6 +7165,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_products_wt = $objOrder->total_products_wt > 0 ? $objOrder->total_products_wt : 0;
$result &= $objOrder->update();
+
+ if (isset($objOrderInvoice) && $objOrderInvoice->id) {
+ $objOrderInvoice->recomputeTotalsFromLines();
+ }
}
if (!$result) {
@@ -7480,8 +7635,8 @@ class AdminOrdersControllerCore extends AdminController
}
}
- // To show rooms extra demands in the modal box in order details view page
- public function ajaxProcessGetRoomTypeBookingDemands()
+ // To show rooms extra services in the modal box in order details view page
+ public function ajaxProcessgetRoomTypeBookingServices()
{
$orderEdit = Tools::getValue('orderEdit');
if (($idProduct = Tools::getValue('id_product'))
@@ -7500,25 +7655,9 @@ class AdminOrdersControllerCore extends AdminController
$smartyVars['id_booking_detail'] = $idHtlBooking;
- $objBookingDemand = new HotelBookingDemands();
-
// set context currency So that we can get prices in the order currency
$this->context->currency = $objCurrency;
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- 1,
- $idHtlBooking
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0,
@@ -7539,11 +7678,11 @@ class AdminOrdersControllerCore extends AdminController
}
$smartyVars['orderEdit'] = $orderEdit;
-
+ $smartyVars['show_active'] = true;
$this->context->smarty->assign($smartyVars);
$modal = array(
- 'modal_id' => 'room-extra-demands',
+ 'modal_id' => 'room-extra-services',
'modal_class' => 'modal-lg order_detail_modal',
'modal_title' => ' '.$this->l('Extra Services'),
'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_extra_services.tpl'),
@@ -7643,61 +7782,6 @@ class AdminOrdersControllerCore extends AdminController
return $servicesTpl;
}
- public function processRenderFacilitiesBlock($idOrder, $idProduct, $dateFrom, $dateTo, $idRoom, $idHtlBookingDetail, $orderEdit)
- {
- $smartyVars = array();
- $objOrder = new Order($idOrder);
- $objCurrency = new Currency($objOrder->id_currency);
- $smartyVars['orderCurrency'] = $objOrder->id_currency;
- $smartyVars['currencySign'] = $objCurrency->sign;
- $smartyVars['link'] = $this->context->link;
- $smartyVars['id_booking_detail'] = $idHtlBookingDetail;
-
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($objOrder->id_currency);
-
- $objBookingDemand = new HotelBookingDemands();
-
- if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- $idRoom,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- 1,
- $idHtlBookingDetail
- )) {
- $smartyVars['extraDemands'] = $extraDemands;
- }
-
- // if admin is editing order
- if ($orderEdit) {
- $smartyVars['orderEdit'] = $orderEdit;
-
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- $smartyVars['roomTypeDemands'] = $roomTypeDemands;
- }
- }
-
- $smartyVars['show_active'] = true;
- $this->context->smarty->assign($smartyVars);
-
- $servicesTpl = $this->context->smarty->fetch(
- _PS_ADMIN_DIR_.'/themes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl'
- );
- return $servicesTpl;
- }
-
public function ajaxProcessUpdateSelectedRoomServices()
{
$response = array('hasError' => false);
@@ -7814,6 +7898,29 @@ class AdminOrdersControllerCore extends AdminController
$result &= $objOrderDetail->update();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')) {
+ $serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id);
+ if ($serviceTourismTaxParams) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+ }
+
if ($objOrderDetail->id_order_invoice != 0) {
// values changes as values are calculated accoding to the quantity of the product by webkul
$order_invoice = new OrderInvoice($objOrderDetail->id_order_invoice);
@@ -7833,6 +7940,10 @@ class AdminOrdersControllerCore extends AdminController
$objOrder->total_paid_tax_excl = Tools::ps_round($objOrder->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$result &= $objOrder->update();
+
+ if (isset($order_invoice) && $order_invoice->id) {
+ $order_invoice->recomputeTotalsFromLines();
+ }
}
}
@@ -8069,6 +8180,28 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->quantity = $objServiceProductCartDetail->quantity;
$objServiceProductOrderDetail->save();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id))
+ ) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
// update totals amount of order
$order->total_products = Tools::ps_round((float)($order->total_products + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
$order->total_products_wt = Tools::ps_round((float)($order->total_products_wt + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
@@ -8082,6 +8215,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)$totalPriceChangeTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)$totalPriceChangeTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->save();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// discount
@@ -8359,6 +8493,28 @@ class AdminOrdersControllerCore extends AdminController
$objServiceProductOrderDetail->auto_added = $autoAdded;
$objServiceProductOrderDetail->save();
+ if (Configuration::get('QLO_USE_TOURISM_TAX')
+ && ($serviceTourismTaxParams = OrderTaxDetail::buildServiceLineTaxParams((int) $objServiceProductOrderDetail->id))
+ ) {
+ OrderTaxDetail::saveTourismTax(
+ $serviceTourismTaxParams['idTaxRulesGroup'],
+ $serviceTourismTaxParams['address'],
+ $serviceTourismTaxParams['unitPriceTaxExcl'],
+ $serviceTourismTaxParams['checkInDate'],
+ $serviceTourismTaxParams['numNights'],
+ $serviceTourismTaxParams['numAdults'],
+ $serviceTourismTaxParams['childrenAges'],
+ $serviceTourismTaxParams['idCurrency'],
+ $serviceTourismTaxParams['collectionType'],
+ $serviceTourismTaxParams['idLang'],
+ $serviceTourismTaxParams['quantity'],
+ $serviceTourismTaxParams['idOrder'],
+ $serviceTourismTaxParams['idOrderDetail'],
+ $serviceTourismTaxParams['idHtlBooking'],
+ $serviceTourismTaxParams['idServiceProductOrderDetail']
+ );
+ }
+
// update totals amount of order
$objOrder->total_products = Tools::ps_round((float)($objOrder->total_products + $totalPriceChangeTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
$objOrder->total_products_wt = Tools::ps_round((float)($objOrder->total_products_wt + $totalPriceChangeTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
@@ -8372,6 +8528,7 @@ class AdminOrdersControllerCore extends AdminController
$objOrderInvoice->total_paid_tax_excl += Tools::ps_round((float)$totalPriceChangeTaxExcl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->total_paid_tax_incl += Tools::ps_round((float)$totalPriceChangeTaxIncl, _PS_PRICE_COMPUTE_PRECISION_);
$objOrderInvoice->save();
+ $objOrderInvoice->recomputeTotalsFromLines();
}
// discounts calculation for order
@@ -8485,6 +8642,8 @@ class AdminOrdersControllerCore extends AdminController
}
if ($res &= $objServiceProductOrderDetail->delete()) {
+ OrderTaxDetail::hardDeleteForBooking(0, array((int) $objServiceProductOrderDetail->id));
+
$order = new Order($objServiceProductOrderDetail->id_order);
if ($objOrderDetail->product_price_calculation_method == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
$numDays = HotelHelper::getNumberOfDays(
@@ -8535,6 +8694,10 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
$res &= $order->update();
+
+ if (isset($objOrderInvoice) && $objOrderInvoice->id) {
+ $objOrderInvoice->recomputeTotalsFromLines();
+ }
}
if ($res) {
$response['service_panel']= $servicesBlock = $this->processRenderServicesPanel(
@@ -8549,7 +8712,7 @@ class AdminOrdersControllerCore extends AdminController
}
} else {
$response['hasError'] = true;
- $response['errors'] = $this->l('Additional service not found');
+ $response['errors'] = $this->l('Extra service not found');
}
} else {
$response['hasError'] = true;
@@ -8559,295 +8722,6 @@ class AdminOrdersControllerCore extends AdminController
$this->ajaxDie(json_encode($response));
}
- // Process when admin changes extra demands of any room while order creation process form.tpl
- public function ajaxProcessChangeRoomDemands()
- {
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- die('1');
- }
- }
- }
- die('0');
- }
-
- // Process when admin edit rooms and edit rooms additional facilities
- public function ajaxProcessAddRoomExtraDemands()
- {
- $response = array('success' => false, 'hasError' => false);
- if ($this->tabAccess['edit'] === 1) {
- if ($idHtlBooking = Tools::getValue('id_htl_booking')) {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail($idHtlBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- if ($roomDemands = json_decode($roomDemands, true)) {
- $order = new Order($objBookingDetail->id_order);
- // set context currency So that we can get prices in the order currency
- $this->context->currency = new Currency($order->id_currency);
-
- $vatAddress = new Address((int)$order->id_address_tax);
- $idLang = (int)$order->id_lang;
- $idProduct = $objBookingDetail->id_product;
- $objHtlBkDtl = new HotelBookingDetail();
- $objRoomDemandPrice = new HotelRoomTypeDemandPrice();
- foreach ($roomDemands as $demand) {
- if (!ValidateCore::isPrice($demand['unit_price'])) {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($demand['id_global_demand'], $idLang);
- $response['hasError'] = true;
- $response['errors'][] = sprintf($this->l('Invalid unit price for %s.'), $objGlobalDemand->name);
- }
- }
- if (!$response['hasError']) {
- foreach ($roomDemands as $demand) {
- $idGlobalDemand = $demand['id_global_demand'];
- $idOption = $demand['id_option'];
- $objBookingDemand = new HotelBookingDemands();
- $objBookingDemand->id_htl_booking = $idHtlBooking;
- $objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand, $idLang);
- if ($idOption) {
- $objOption = new HotelRoomTypeGlobalDemandAdvanceOption($idOption, $idLang);
- $objBookingDemand->name = $objOption->name;
- } else {
- $idOption = 0;
- $objBookingDemand->name = $objGlobalDemand->name;
- }
- $objBookingDemand->unit_price_tax_excl = $demand['unit_price'];
- $objBookingDemand->unit_price_tax_incl = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $idGlobalDemand,
- $idOption,
- 1,
- 6,
- null,
- null,
- null,
- null,
- $demand['unit_price']
- );
- $numDays = 1;
- if ($objGlobalDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
- }
- $objBookingDemand->total_price_tax_excl = $totalPriceTaxExcl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = $totalPriceTaxIncl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
- $res &= $order_invoice->update();
- }
-
- $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
- );
- $taxCalc = $taxManager->getTaxCalculator();
- $objBookingDemand->tax_computation_method = (int)$taxCalc->computation_method;
- if ($objBookingDemand->save()) {
- $objBookingDemand->tax_calculator = $taxCalc;
- // Now save tax details of the extra demand
- $objBookingDemand->setBookingDemandTaxDetails();
- }
- }
-
- $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
- if ($order->save()) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- } else {
- $response['hasError'] = true;
- $response['errors'][] = Tools::displayError('You do not have permission to edit this order.');
- }
- die(json_encode($response));
- }
-
- public function ajaxProcessUpdateRoomExtraDemands()
- {
- $response = array('success' => false);
- if ($this->tabAccess['edit'] === 1) {
- if ($idBookingDemand = Tools::getValue('id_booking_demand')) {
- if (Validate::isLoadedObject($objBookingDemand = new HotelBookingDemands($idBookingDemand))) {
- $unitPrice = Tools::getValue('unit_price');
- if (!$unitPrice || !ValidateCore::isPrice($unitPrice)) {
- $response['hasError'] = true;
- $response['errors'] = $this->l('Invalid unit price');
- }
- $oldPriceTaxExcl = $objBookingDemand->unit_price_tax_excl;
- $oldPriceTaxIncl = $objBookingDemand->unit_price_tax_incl;
- if ($oldPriceTaxExcl > 0) {
- $oldTaxMultiplier = $oldPriceTaxIncl / $oldPriceTaxExcl;
- } else {
- $oldTaxMultiplier = 1;
- }
-
- $objBookingDemand->unit_price_tax_excl = $unitPrice;
- $objBookingDemand->unit_price_tax_incl = $unitPrice * $oldTaxMultiplier;
-
- $objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking);
- $order = new Order($objBookingDetail->id_order);
- if ($objBookingDemand->price_calc_method == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $numDays = HotelHelper::getNumberOfDays(
- $objBookingDetail->date_from,
- $objBookingDetail->date_to
- );
-
- $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_excl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(
- ($objBookingDemand->unit_price_tax_incl * $numDays),
- 1,
- $order->round_type,
- $order->round_mode
- );
- } else {
- $objBookingDemand->total_price_tax_excl = Tools::processPriceRounding(
- $objBookingDemand->unit_price_tax_excl,
- 1,
- $order->round_type,
- $order->round_mode
- );
- $objBookingDemand->total_price_tax_incl = Tools::processPriceRounding(
- $objBookingDemand->unit_price_tax_incl,
- 1,
- $order->round_type,
- $order->round_mode
- );
- }
- if ($objBookingDemand->save()) {
- $objBookingDemand->setBookingDemandTaxDetails(1);
-
- $priceDiffTaxExcl = $objBookingDemand->total_price_tax_excl - $oldPriceTaxExcl;
- $priceDiffTaxIncl = $objBookingDemand->total_price_tax_incl - $oldPriceTaxIncl;
-
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
-
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->update();
- }
-
- $order->total_paid_tax_excl = Tools::ps_round((float)($order->total_paid_tax_excl + $priceDiffTaxExcl), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round((float)($order->total_paid_tax_incl + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid = Tools::ps_round((float)($order->total_paid + $priceDiffTaxIncl), _PS_PRICE_COMPUTE_PRECISION_);
- if ($order->save()) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- die(json_encode($response));
- }
-
- // delete room extra demand while order edit
- public function ajaxProcessDeleteRoomExtraDemand()
- {
- $response = array('success' => false);
- // Check tab access is allowed to edit
- if ($this->tabAccess['edit'] === 1) {
- $res = true;
- if ($idBookingDemand = Tools::getValue('id_booking_demand')) {
- if (Validate::isLoadedObject($objBookingDemand = new HotelBookingDemands($idBookingDemand))) {
- // first delete the tax details of the booking demand
- if ($objBookingDemand->deleteBookingDemandTaxDetails($idBookingDemand)) {
- if ($objBookingDemand->delete()) {
- if (Validate::isLoadedObject($objBookingDetail = new HotelBookingDetail($objBookingDemand->id_htl_booking))) {
- // change order total
- $order = new Order($objBookingDetail->id_order);
-
- $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_);
- $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_);
-
- $order->save();
-
- $order_detail = new OrderDetail($objBookingDetail->id_order_detail);
- // Update OrderInvoice of this OrderDetail
- if ($order_detail->id_order_invoice != 0) {
- // values changes as values are calculated accoding to the quantity of the product by webkul
- $order_invoice = new OrderInvoice($order_detail->id_order_invoice);
- $order_invoice->total_paid_tax_excl = Tools::ps_round((float)($order_invoice->total_paid_tax_excl - $objBookingDemand->total_price_tax_excl), _PS_PRICE_COMPUTE_PRECISION_);
- $order_invoice->total_paid_tax_incl = Tools::ps_round((float)($order_invoice->total_paid_tax_incl - $objBookingDemand->total_price_tax_incl), _PS_PRICE_COMPUTE_PRECISION_);
- $res &= $order_invoice->update();
- }
- if ($res) {
- $response['facilities_panel'] = $this->processRenderFacilitiesBlock(
- $order->id,
- $objBookingDetail->id_product,
- $objBookingDetail->date_from,
- $objBookingDetail->date_to,
- $objBookingDetail->id_room,
- $objBookingDetail->id,
- true
- );
- $response['success'] = true;
- }
- }
- }
- }
- }
- }
- }
-
- die(json_encode($response));
- }
-
public function ajaxProcessUpdateServiceProduct()
{
$operator = Tools::getValue('operator', 'up');
@@ -9058,4 +8932,133 @@ class AdminOrdersControllerCore extends AdminController
$this->ajaxDie(json_encode($result));
}
+
+ /**
+ *
+ * @param int $idHtlBooking
+ * @param int $idRoomProduct
+ * @param array|null $bookingTourismTaxStatus
+ * @return int OrderTaxDetail::STATUS_APPLIED|STATUS_NOT_APPLICABLE|STATUS_NONE
+ */
+ protected static function combinedRoomTourismTaxStatus($idHtlBooking, $idRoomProduct, $bookingTourismTaxStatus, $serviceTourismTaxTotal)
+ {
+ $roomApplied = $bookingTourismTaxStatus && $bookingTourismTaxStatus['status'] === OrderTaxDetail::STATUS_APPLIED;
+ if ($roomApplied || $serviceTourismTaxTotal > 0) {
+ return OrderTaxDetail::STATUS_APPLIED;
+ }
+
+ $roomHasRule = (bool) Product::getIdTourismTaxRulesGroupByIdProduct((int) $idRoomProduct);
+ $serviceHasRule = false;
+ foreach (ServiceProductOrderDetail::getActiveIdsByHtlBookingDetail((int) $idHtlBooking) as $idServiceLine) {
+ $serviceLine = new ServiceProductOrderDetail($idServiceLine);
+ if (Validate::isLoadedObject($serviceLine) && Product::getIdTourismTaxRulesGroupByIdProduct((int) $serviceLine->id_product)) {
+ $serviceHasRule = true;
+ break;
+ }
+ }
+
+ return ($roomHasRule || $serviceHasRule) ? OrderTaxDetail::STATUS_NONE : OrderTaxDetail::STATUS_NOT_APPLICABLE;
+ }
+
+ /**
+ * Map per-booking tourism tax apply/exempt failures (whole-order bulk case) to deduplicated messages.
+ *
+ * @param array $failures
+ * @param array $messagesByResult
+ * @return string[]
+ */
+ protected static function tourismTaxErrorsFromResults(array $failures, array $messagesByResult)
+ {
+ $messages = array();
+ foreach ($failures as $failure) {
+ if (!isset($messagesByResult[$failure['result']])) {
+ continue;
+ }
+ $messages[$failure['result']] = $messagesByResult[$failure['result']];
+ }
+ return array_values($messages);
+ }
+
+ /**
+ * Apply tourism tax to a booking (id_htl_booking), a standalone service line
+ * (id_service_product_order_detail), or every booking of a whole order (id_order) —
+ * see OrderTaxDetail::applyBooking()/applyServiceLine().
+ */
+ public function ajaxProcessApplyTourismTax()
+ {
+ $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
+ $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ $idOrder = (int) Tools::getValue('id_order', 0);
+ $idEmployee = (int) Context::getContext()->employee->id;
+ $autoMsgLabel = $this->l('Tourism Tax Applied');
+ $errors = array();
+ $messagesByResult = array(
+ OrderTaxDetail::APPLY_ERROR_RESTORE => $this->l('Could not restore tourism tax.'),
+ OrderTaxDetail::APPLY_ERROR_NOT_APPLICABLE => $this->l('Tourism tax is not applicable for this booking.'),
+ );
+
+ if ($idHtlBooking) {
+ $result = OrderTaxDetail::applyBooking($idHtlBooking, $idEmployee, $autoMsgLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idServiceProductOrderDetail) {
+ $result = OrderTaxDetail::applyServiceLine($idServiceProductOrderDetail, $idEmployee, $autoMsgLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idOrder) {
+ $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::applyForOrder($idOrder, $idEmployee, $autoMsgLabel), $messagesByResult);
+ } else {
+ $errors[] = $this->l('Invalid request parameters.');
+ }
+
+ die(Tools::jsonEncode(array(
+ 'hasError' => !empty($errors),
+ 'errors' => $errors,
+ )));
+ }
+
+ /**
+ * Exempt tourism tax for a booking (id_htl_booking), a standalone service line
+ * (id_service_product_order_detail), or every booking of a whole order (id_order) —
+ * see OrderTaxDetail::exemptBooking()/exemptServiceLine().
+ */
+ public function ajaxProcessExemptTourismTax()
+ {
+ $idHtlBooking = (int) Tools::getValue('id_htl_booking', 0);
+ $idServiceProductOrderDetail = (int) Tools::getValue('id_service_product_order_detail', 0);
+ $idOrder = (int) Tools::getValue('id_order', 0);
+ $idEmployee = (int) Context::getContext()->employee->id;
+ $note = trim((string) Tools::getValue('note', ''));
+ $note = ($note !== '') ? $note : null;
+ $autoMsgLabel = $this->l('Tourism Tax Exempted');
+ $remarkLabel = $this->l('Remark');
+ $errors = array();
+ $messagesByResult = array(
+ OrderTaxDetail::EXEMPT_ERROR_NO_RULE => $this->l('Tourism tax exemption is not applicable for this line.'),
+ OrderTaxDetail::EXEMPT_ERROR_SAVE => $this->l('Could not exempt tourism tax.'),
+ );
+
+ if ($idHtlBooking) {
+ $result = OrderTaxDetail::exemptBooking($idHtlBooking, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idServiceProductOrderDetail) {
+ $result = OrderTaxDetail::exemptServiceLine($idServiceProductOrderDetail, $idEmployee, $note, $autoMsgLabel, $remarkLabel);
+ if (isset($messagesByResult[$result])) {
+ $errors[] = $messagesByResult[$result];
+ }
+ } elseif ($idOrder) {
+ $errors = self::tourismTaxErrorsFromResults(OrderTaxDetail::exemptForOrder($idOrder, $idEmployee, $note, $autoMsgLabel, $remarkLabel), $messagesByResult);
+ } else {
+ $errors[] = $this->l('Invalid request parameters.');
+ }
+
+ die(Tools::jsonEncode(array(
+ 'hasError' => !empty($errors),
+ 'errors' => $errors,
+ )));
+ }
}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 79499ce6b..66b70e3e9 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -112,7 +112,6 @@ class AdminProductsControllerCore extends AdminController
'Configuration' => $this->l('Rooms'),
'Occupancy' => $this->l('Occupancy'),
'LengthOfStay' => $this->l('Length of Stay'),
- 'AdditionalFacilities' => $this->l('Additional Facilities'),
);
if ($this->context->shop->getContext() != Shop::CONTEXT_GROUP) {
@@ -128,7 +127,6 @@ class AdminProductsControllerCore extends AdminController
'Occupancy' => 8,
'ServiceProduct' => 9,
'LengthOfStay' => 10,
- 'AdditionalFacilities' => 11,
));
}
@@ -232,7 +230,6 @@ class AdminProductsControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (pd.`id_product` = a.`id_product` AND pd.`active` = 1)
LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)
LEFT JOIN `'._DB_PREFIX_.'feature_product` fp ON (fp.`id_product` = a.`id_product`)
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_demand` hrtd ON (hrtd.`id_product` = a.`id_product`)
LEFT JOIN (
SELECT rsp.*, GROUP_CONCAT(pl.`name`) AS service_products
FROM `'._DB_PREFIX_.'htl_room_type_service_product` rsp
@@ -245,7 +242,7 @@ class AdminProductsControllerCore extends AdminController
$this->_select .= ' a.`show_at_front`, (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, ';
$this->_select .= 'hrt.`adults`, hrt.`children`, hrt.`max_guests`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, ';
$this->_select .= 'shop.`name` AS `shopname`, a.`id_shop_default`, ';
- $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`';
+ $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`, a.`id_tourism_tax_rules_group`';
$this->_select .= ', IFNULL(hap.`active`, 0) AS advance_payment';
$this->_select .= ', IF(IFNULL(hap.`active`, 0), 1, 0) badge_success, IF(IFNULL(hap.`active`, 0), 0, 1) badge_danger ';
@@ -435,23 +432,6 @@ class AdminProductsControllerCore extends AdminController
'displayed' => false,
);
- $additionalFacilities = array();
- $objHotelRoomTypeGlobalDemand = new HotelRoomTypeGlobalDemand();
- $demands = $objHotelRoomTypeGlobalDemand->getAllDemands();
- foreach ($demands as $demand) {
- $additionalFacilities[$demand['id_global_demand']] = $demand['name'];
- }
- $this->fields_list['id_global_demand'] = array(
- 'title' => $this->l('Additional Facilities'),
- 'align' => 'text-center',
- 'type' => 'select',
- 'multiple' => true,
- 'operator' => 'and',
- 'filter_key' => 'hrtd!id_global_demand',
- 'list' => $additionalFacilities,
- 'displayed' => false,
- );
-
$this->locationsAndHotels = array();
$idLocationsCategory = Configuration::get('PS_LOCATIONS_CATEGORY');
$this->objLocationsCategory = new Category($idLocationsCategory, $this->context->language->id);
@@ -665,13 +645,13 @@ class AdminProductsControllerCore extends AdminController
{
$prefix = $this->getCookieFilterPrefix();
$orderByPriceFinal = (empty($orderBy) ? ($this->context->cookie->__get($prefix.$this->table.'Orderby') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'id_'.$this->table) : $orderBy);
- $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderby') : 'ASC') : $orderWay);
+ $orderWayPriceFinal = (empty($orderWay) ? ($this->context->cookie->__get($prefix.$this->table.'Orderway') ? $this->context->cookie->__get($prefix.$this->table.'Orderway') : 'ASC') : $orderWay);
if ($orderByPriceFinal == 'price_final') {
$orderBy = 'id_'.$this->table;
$orderWay = 'ASC';
}
if ($this->action == 'export' && empty($this->_listsql)) {
- $this->_select .= ' , trg.`name` AS `id_tax_rules_group`, `features`, hrtdl.`global_demands`';
+ $this->_select .= ' , trg.`name` AS `id_tax_rules_group`, `features`';
$this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'tax_rules_group` trg
ON trg.`id_tax_rules_group` = a.`id_tax_rules_group`
LEFT JOIN (SELECT GROUP_CONCAT(fpl.`name`) AS features, fp.`id_product`
@@ -682,14 +662,6 @@ class AdminProductsControllerCore extends AdminController
GROUP BY fp.`id_product`
) AS fpl ON (a.`id_product` = fpl.`id_product`)';
- $this->_join .= ' LEFT JOIN (SELECT hrtgd.`id_product`, `id_lang`, GROUP_CONCAT(`name`) AS `global_demands`
- FROM `'._DB_PREFIX_.'htl_room_type_global_demand_lang` hrtgdl
- LEFT JOIN `'._DB_PREFIX_.'htl_room_type_demand` hrtgd
- ON hrtgd.`id_global_demand` = hrtgdl.`id_global_demand`
- WHERE `id_lang`='.(int) $this->context->language->id.'
- GROUP BY hrtgd.`id_product`
- ) AS hrtdl ON (hrtdl.`id_product` = a.`id_product`)';
-
$this->fields_list = array_merge($this->fields_list, array(
'id_tax_rules_group' => array(
'title' => $this->l('Id Tax Rules group'),
@@ -701,35 +673,59 @@ class AdminProductsControllerCore extends AdminController
'service_products' => array(
'title' => $this->l('Services Products'),
),
- 'global_demands' => array(
- 'title' => $this->l('Additional Facilities'),
- )
)
);
unset($this->fields_list['id_category_default']);
- unset($this->fields_list['id_global_demand']);
unset($this->fields_list['id_feature']);
unset($this->fields_list['id_service_product']);
}
- parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $this->context->shop->id);
+ parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $id_lang_shop ?: $this->context->shop->id);
/* update product quantity with attributes ...*/
$nb = count($this->_list);
if ($this->_list) {
$context = $this->context->cloneContext();
$context->shop = clone($context->shop);
+ $isAllShopsContext = (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP);
+ $priceDisplayPrecision = (int) Configuration::get('PS_PRICE_DISPLAY_PRECISION');
+ $useTourismTax = (bool) Configuration::get('QLO_USE_TOURISM_TAX');
+ $todayDate = date('Y-m-d');
+ $tomorrowDate = date('Y-m-d', strtotime('+1 day', strtotime($todayDate)));
+
/* update product final price */
for ($i = 0; $i < $nb; $i++) {
- if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP) {
+ if ($isAllShopsContext) {
$context->shop = new Shop((int)$this->_list[$i]['id_shop_default']);
}
// convert price with the currency from context
$this->_list[$i]['price'] = Tools::convertPrice($this->_list[$i]['price'], $this->context->currency, true, $this->context);
$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null,
- (int)Configuration::get('PS_PRICE_DISPLAY_PRECISION'), null, false, true, 1, true, null, null, null, $nothing, true, true,
+ $priceDisplayPrecision, null, false, true, 1, true, null, null, null, $nothing, true, true,
$context);
+
+ $idTourismTaxRulesGroup = (int) $this->_list[$i]['id_tourism_tax_rules_group'];
+ $idHotel = (int) $this->_list[$i]['id_hotel'];
+ if ($useTourismTax && $idTourismTaxRulesGroup && $idHotel) {
+ $idProduct = $this->_list[$i]['id_product'];
+ $vatAddress = new Address(HotelRoomType::getHotelIdAddressByIdProduct($idProduct));
+ $vatCalculator = TaxManagerFactory::getManager($vatAddress, Product::getIdTaxRulesGroupByIdProduct($idProduct))->getTaxCalculator();
+ $unitPriceTaxExcl = $vatCalculator->removeTaxes($this->_list[$i]['price_tmp']);
+
+ $hotelTaxContext = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, $vatAddress);
+ $taxCalculator = TaxManagerFactory::getManager($hotelTaxContext['address'], $idTourismTaxRulesGroup)->getTaxCalculator();
+ $this->_list[$i]['price_tmp'] += $taxCalculator->getTaxesTotalAmount(
+ $unitPriceTaxExcl,
+ $todayDate,
+ 1,
+ 1,
+ array(),
+ $hotelTaxContext['collectionType'],
+ 1,
+ $this->context->currency->id
+ );
+ }
}
}
@@ -967,11 +963,6 @@ class AdminProductsControllerCore extends AdminController
)) {
$this->errors[] = Tools::displayError('An error occurred while duplicating rooms.');
}
- if (!HotelRoomTypeDemand::duplicateRoomTypeDemands($id_product_old, $product->id)) {
- $this->errors[] = Tools::displayError(
- 'An error occurred while duplicating additional facilities.'
- );
- }
} else {
$this->errors[] = Tools::displayError('An error occurred while duplicating room type.');
}
@@ -2261,9 +2252,6 @@ class AdminProductsControllerCore extends AdminController
if ($this->isTabSubmitted('Configuration')) {
$this->processConfiguration();
}
- if ($this->isTabSubmitted('AdditionalFacilities')) {
- $this->processAdditionalFacilities();
- }
// $this->updatePackItems($object);
// Disallow avanced stock management if the product become a pack
@@ -3303,7 +3291,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRuleGroup = new TaxRulesGroup(
$serviceProductPriceInfo['id_tax_rules_group'],
$this->context->language->id
- ))) {
+ )) && !$objTaxRuleGroup->is_tourism_tax_rule_group) {
$associationInfo['tax_rules_group_name'] = $objTaxRuleGroup->name;
}
$associationInfo['id_room_type_service_product_price'] = $serviceProductPriceInfo['id_room_type_service_product_price'];
@@ -3313,7 +3301,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRuleGroup = new TaxRulesGroup(
$objProduct->id_tax_rules_group,
$this->context->language->id
- ))) {
+ )) && !$objTaxRuleGroup->is_tourism_tax_rule_group) {
$associationInfo['default_tax_rules_group_name'] = $objTaxRuleGroup->name;
}
@@ -3327,7 +3315,7 @@ class AdminProductsControllerCore extends AdminController
if (Validate::isLoadedObject($objTaxRulesGroup = new TaxRulesGroup(
$serviceProduct['id_tax_rules_group'],
$this->context->language->id
- ))) {
+ )) && !$objTaxRulesGroup->is_tourism_tax_rule_group) {
$serviceProduct['tax_rules_group_name'] = $objTaxRulesGroup->name;
}
@@ -3834,136 +3822,6 @@ class AdminProductsControllerCore extends AdminController
die(json_encode($response));
}
- public function initFormAdditionalFacilities($obj)
- {
- $data = $this->createTemplate($this->tpl_form);
-
- if ($obj->id) {
- $objGlobalDemand = new HotelRoomTypeGlobalDemand();
- $allDemands = $objGlobalDemand->getAllDemands();
- foreach($allDemands as &$demand) {
- if ($demand['id_tax_rules_group'] == 0) {
- $demand['default_tax_rules_group_name'] = 'No tax';
- } else {
- $objTaxRuleGroup = new TaxRulesGroup(
- $demand['id_tax_rules_group'],
- $this->context->language->id
- );
- $demand['default_tax_rules_group_name'] = $objTaxRuleGroup->name;
- }
- }
- $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-
- // get room type additional facilities
- $objRoomDemand = new HotelRoomTypeDemand();
- $selectedDemands = $objRoomDemand->getRoomTypeDemands($obj->id, 0, 0);
-
- $data->assign(array(
- 'product' => $obj,
- 'selectedDemands' => $selectedDemands,
- 'allDemands' => $allDemands,
- 'defaultcurrencySign' => $objCurrency->sign,
- 'idDefaultcurrency' => $objCurrency->id,
- ));
- } else {
- $this->displayWarning($this->l('You must save this room type before managing additional facilities.'));
- }
-
- $this->tpl_form_vars['custom_form'] = $data->fetch();
- }
-
- public function processAdditionalFacilities()
- {
- if ($idProduct = Tools::getValue('id_product')) {
- $errors = array();
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- // first delete all the previously saved prices and demands of this room type
- $objRoomTypeDemand->deleteRoomTypeDemands($idProduct);
- $objRoomTypeDemandPrice->deleteRoomTypeDemandPrices($idProduct);
- if ($selectedDemands = Tools::getValue('selected_demand')) {
- $objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption();
- foreach ($selectedDemands as $idGlobalDemand) {
- if (Validate::isLoadedObject($objGlobalDemand = new HotelRoomTypeGlobalDemand($idGlobalDemand))) {
- // save selected demands for this room type
- $objRoomTypeDemand = new HotelRoomTypeDemand();
- $objRoomTypeDemand->id_product = $idProduct;
- $objRoomTypeDemand->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemand->save();
-
- // save selected demands prices for this room type
- $demandPrice = Tools::getValue('demand_price_'.$idGlobalDemand);
- if (Validate::isPrice($demandPrice)) {
- if ($objGlobalDemand->price != $demandPrice) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $idProduct;
- $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemandPrice->id_option = 0;
- $objRoomTypeDemandPrice->price = $demandPrice;
- $objRoomTypeDemandPrice->save();
- }
- } else {
- $errors[] = Tools::displayError('Invalid demand price of facility.').
- ' : '.$objGlobalDemand->name[$this->context->language->id];
- }
- if ($advOptions = $objAdvOption->getGlobalDemandAdvanceOptions($idGlobalDemand)) {
- foreach ($advOptions as $option) {
- if (Validate::isLoadedObject($objAdvOption = new HotelRoomTypeGlobalDemandAdvanceOption($option['id']))) {
- $optionPrice = Tools::getValue('option_price_'.$option['id']);
- if (Validate::isPrice($optionPrice)) {
- if ($optionPrice != $objAdvOption->price) {
- $objRoomTypeDemandPrice = new HotelRoomTypeDemandPrice();
- $objRoomTypeDemandPrice->id_product = $idProduct;
- $objRoomTypeDemandPrice->id_global_demand = $idGlobalDemand;
- $objRoomTypeDemandPrice->id_option = $option['id'];
- $objRoomTypeDemandPrice->price = $optionPrice;
- $objRoomTypeDemandPrice->save();
- }
- } else {
- $errors[] = Tools::displayError('Invalid price of advanced option: ').$objAdvOption->name[$this->context->language->id];
- }
- }
- }
- }
- }
- }
- if (count($errors)) {
- $this->warnings[] = Tools::displayError('Invalid price values for additional facilities were not saved. Please correct them and try again.');
- $this->errors = array_merge($this->errors, $errors);
- }
-
- $objCartBookingData = new HotelCartBookingData();
- if ($cartExtraDemands = $objCartBookingData->getCartExtraDemands(0, $idProduct)) {
- // delete the demands from cart if not available in cart
- $objRoomDemand = new HotelRoomTypeDemand();
- $roomTypeDemandIds = array();
- if ($roomTypeDemands = $objRoomDemand->getRoomTypeDemands($idProduct)) {
- $roomTypeDemandIds = array_keys($roomTypeDemands);
- }
- foreach ($cartExtraDemands as &$demandInfo) {
- if (isset($demandInfo['extra_demands']) && $demandInfo['extra_demands']) {
- $cartChanged = 0;
- foreach ($demandInfo['extra_demands'] as $key => $demand) {
- if (!in_array($demand['id_global_demand'], $roomTypeDemandIds)) {
- $cartChanged = 1;
- unset($demandInfo['extra_demands'][$key]);
- }
- }
- if ($cartChanged) {
- if (Validate::isLoadedObject(
- $objCartBooking = new HotelCartBookingData($demandInfo['id'])
- )) {
- $objCartBooking->extra_demands = json_encode($demandInfo['extra_demands']);
- $objCartBooking->save();
- }
- }
- }
- }
- }
- }
- }
- }
-
/**
* @param Product $obj
*
@@ -4192,6 +4050,25 @@ class AdminProductsControllerCore extends AdminController
$data->assign('productFeaturePrices', $productFeaturePrices);
}
+ if (Configuration::get('QLO_USE_TOURISM_TAX') && !Tax::excludeTaxeOption()) {
+ $tourismTaxRulesGroups = TaxRulesGroup::getTaxRulesGroupsForOptions(true, true);
+ $data->assign('tourismTaxRulesGroups', $tourismTaxRulesGroups);
+ $data->assign('id_tourism_tax_rules_group', isset($product->id_tourism_tax_rules_group) ? (int) $product->id_tourism_tax_rules_group : 0);
+
+ $roomTypeInfo = (new HotelRoomType())->getRoomTypeInfoByIdProduct((int) $product->id);
+ $idHotel = $roomTypeInfo ? (int) $roomTypeInfo['id_hotel'] : 0;
+ $collectionType = TaxConfiguration::resolveHotelAddressAndCollectionType($idHotel, $address)['collectionType'];
+
+ $tourismTaxRates = array();
+ foreach ($tourismTaxRulesGroups as $tourismTaxRulesGroup) {
+ if (!$tourismTaxRulesGroup['id_tax_rules_group']) {
+ continue;
+ }
+ $tourismTaxRates[$tourismTaxRulesGroup['id_tax_rules_group']] = TaxConfiguration::getPreviewParams($tourismTaxRulesGroup['id_tax_rules_group'], $address, $this->context->language->id, $collectionType);
+ }
+ $data->assign('tourismTaxRatesByGroup', $tourismTaxRates);
+ }
+
$this->tpl_form_vars['custom_form'] = $data->fetch();
}
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index c2ac5e28f..876780463 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -36,7 +36,6 @@ class AdminSearchControllerCore extends AdminController
'AdminFeatures' => 1,
'AdminOrders' => 1,
'AdminOrderRefundRules' => 1,
- 'AdminRoomTypeGlobalDemand' => 1,
'AdminGroups' => 1,
'AdminHotelAmenities' => 1,
'AdminCustomers' => 1,
@@ -191,7 +190,6 @@ class AdminSearchControllerCore extends AdminController
if (!$searchType) {
$this->searchAddress();
$this->searchHotelAmenities();
- $this->searchAdditionalFacilities();
$this->searchRefundRules();
}
}
@@ -436,6 +434,7 @@ class AdminSearchControllerCore extends AdminController
if ($hotelAmenities = $objHotelAmenities->searchByName($this->query, $this->context->language->id)) {
$amenities = array();
foreach ($hotelAmenities as $key => $hotelAmenity) {
+ $amenities[$hotelAmenity['id_amenity']]['id_amenity'] = $hotelAmenity['id_amenity'];
$amenities[$hotelAmenity['id_amenity']]['name'] = $hotelAmenity['name'];
if ($hotelAmenity['id_parent']) {
$amenities[$hotelAmenity['id_amenity']]['id'] = $hotelAmenity['id_parent'];
@@ -450,29 +449,6 @@ class AdminSearchControllerCore extends AdminController
}
}
- public function searchAdditionalFacilities()
- {
- if (class_exists('HotelRoomTypeGlobalDemand')) {
- if (isset($this->controllerAccess['AdminRoomTypeGlobalDemand']) && $this->controllerAccess['AdminRoomTypeGlobalDemand']) {
- $objHotelRoomTypeGlobalDemands = new HotelRoomTypeGlobalDemand();
- if ($globalDemads = $objHotelRoomTypeGlobalDemands->searchByName($this->query, $this->context->language->id)) {
- foreach ($globalDemads as $key => $demand) {
- if (!(int) $globalDemads[$key]['price']) {
- $globalDemads[$key]['price'] = $globalDemads[$key]['option_price'];
- }
-
- $globalDemads[$key]['per_day_price_calc'] = $this->l('No');
- if ($globalDemads[$key]['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY) {
- $globalDemads[$key]['per_day_price_calc'] = $this->l('Yes');
- }
- }
-
- $this->_list['global_demands'] = $globalDemads;
- }
- }
- }
- }
-
public function searchRefundRules()
{
if (class_exists('HotelOrderRefundRules')) {
@@ -559,18 +535,6 @@ class AdminSearchControllerCore extends AdminController
);
}
- protected function initGlobalDemandList()
- {
- $this->show_toolbar = false;
- $this->fields_list['global_demands'] = array(
- 'id_global_demand' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
- 'name' => array('title' => $this->l('Name')),
- 'option_name' => array('title' => $this->l('Advance Option Name')),
- 'price' => array('title' => $this->l('Price'), 'type' => 'price', 'currency' => true),
- 'per_day_price_calc' => array('title' => $this->l('Per day price calculation'))
- );
- }
-
protected function initRefundRuleList()
{
$this->show_toolbar = false;
@@ -854,10 +818,10 @@ class AdminSearchControllerCore extends AdminController
$helper = new HelperList();
$helper->shopLinkType = '';
$helper->simple_header = true;
- $helper->identifier = 'id_customer_message';
- $helper->actions = array('edit');
+ $helper->identifier = 'id_customer_thread';
+ $helper->actions = array('view');
$helper->show_toolbar = false;
- $helper->table = 'feature';
+ $helper->table = 'customer_thread';
$helper->currentIndex = $this->context->link->getAdminLink('AdminCustomerThreads', false);
$query = trim(Tools::getValue('bo_query'));
@@ -980,27 +944,6 @@ class AdminSearchControllerCore extends AdminController
$this->tpl_view_vars['groups'] = $view;
}
- if (isset($this->_list['global_demands']) && count($this->_list['global_demands'])) {
- $view = '';
- $this->initGlobalDemandList();
- $helper = new HelperList();
- $helper->shopLinkType = '';
- $helper->simple_header = true;
- $helper->identifier = 'id_global_demand';
- $helper->actions = array('edit');
- $helper->show_toolbar = false;
- $helper->table = 'htl_room_type_global_demand';
- $helper->currentIndex = $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand', false);
- $helper->token = Tools::getAdminTokenLite('AdminRoomTypeGlobalDemand');
-
- if ($this->_list['global_demands']) {
- $view = $helper->generateList($this->_list['global_demands'], $this->fields_list['global_demands']);
- }
-
- $this->tpl_view_vars['num_global_demands'] = count($this->_list['global_demands']);
- $this->tpl_view_vars['global_demands'] = $view;
- }
-
if (isset($this->_list['refund_rules']) && count($this->_list['refund_rules'])) {
$view = '';
$this->initRefundRuleList();
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index e08d8c6dd..a93ca9f3e 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -560,29 +560,11 @@ public function initPageHeaderToolbar()
$objHotelBookingDetail = new HotelBookingDetail();
$bookingDetails = $objHotelBookingDetail->getBookingDataByOrderId($idOrder);
- $objBookingDemands = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
foreach ($bookingDetails as &$booking) {
$booking['extra_service_total_price_tax_incl'] = 0;
- $extraDemands = $objBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $booking['id_product'],
- $booking['id_room'],
- $booking['date_from'],
- $booking['date_to'],
- 0,
- 0,
- 1,
- $booking['id']
- );
- if ($extraDemands) {
- foreach ($extraDemands as $demand) {
- $booking['extra_service_total_price_tax_incl'] += (float) $demand['total_price_tax_incl'];
- }
- }
-
$roomServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
0, 0, 0, 0, 0, 0, 0, 0, null, null, null, 0, $booking['id']
);
diff --git a/controllers/admin/AdminSourcesController.php b/controllers/admin/AdminSourcesController.php
new file mode 100644
index 000000000..c51d5dd36
--- /dev/null
+++ b/controllers/admin/AdminSourcesController.php
@@ -0,0 +1,850 @@
+bootstrap = true;
+ $this->table = 'business_source';
+ $this->className = 'BusinessSource';
+ $this->identifier = 'id_business_source';
+ $this->list_id = 'business_source';
+ $this->lang = true;
+ $this->deleted = false;
+ $this->_defaultOrderBy = 'position';
+ $this->_defaultOrderWay = 'ASC';
+ $this->context = Context::getContext();
+ $this->_new_list_header_design = true;
+ $this->bulk_actions = array(
+ 'delete' => array(
+ 'text' => $this->l('Delete selected'),
+ 'icon' => 'icon-trash',
+ 'confirm' => $this->l('Delete selected items?')
+ )
+ );
+
+ parent::__construct();
+ }
+
+ public function setMedia()
+ {
+ parent::setMedia();
+
+ $this->addJS(_PS_JS_DIR_.'admin/sources.js');
+ }
+
+ public function init()
+ {
+ if (Tools::isSubmit('addsource') || Tools::isSubmit('addbusiness_source')) {
+ $this->display = 'add';
+ }
+ if (Tools::isSubmit('updatesource') || Tools::isSubmit('updatebusiness_source')) {
+ $this->display = 'edit';
+ }
+ if (Tools::isSubmit('submitAddsource') || Tools::isSubmit('submitAddsourceAndStay')) {
+ $this->display = Tools::getValue('id_source') ? 'edit' : 'add';
+ }
+ if (Tools::isSubmit('submitAddbusiness_source') || Tools::isSubmit('submitAddbusiness_sourceAndStay')) {
+ $this->display = Tools::getValue('id_business_source') ? 'edit' : 'add';
+ }
+
+ return parent::init();
+ }
+
+ public function initContent()
+ {
+ if (Tools::isSubmit('submitFiltersource') || Tools::isSubmit('submitResetsource')) {
+ $this->list_id = 'source';
+ $this->display = 'view';
+
+ $idBusinessSource = (int) Tools::getValue('id_business_source');
+ self::$currentIndex .= '&id_business_source=' . $idBusinessSource . '&viewbusiness_source';
+ if (Tools::isSubmit('submitResetsource')) {
+ $this->processResetFilters('source');
+ }
+ }
+ parent::initContent();
+ }
+
+ /**
+ * @see AdminController::initPageHeaderToolbar()
+ */
+ public function initPageHeaderToolbar()
+ {
+ if (empty($this->display)) {
+ $this->page_header_toolbar_btn['new_business_source'] = array(
+ 'href' => self::$currentIndex.'&addbusiness_source&token='.$this->token,
+ 'desc' => $this->l('Add new Business Source', null, null, false),
+ 'icon' => 'process-icon-new'
+ );
+ } elseif ($this->display == 'view') {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ if ($idBusinessSource) {
+ $this->page_header_toolbar_btn['new_source'] = array(
+ 'href' => self::$currentIndex.'&addsource&id_business_source='.$idBusinessSource.'&token='.$this->token,
+ 'desc' => $this->l('Add new Booking Source', null, null, false),
+ 'icon' => 'process-icon-new'
+ );
+ $this->page_header_toolbar_btn['back_to_business'] = array(
+ 'href' => self::$currentIndex.'&token='.$this->token,
+ 'desc' => $this->l('Back To Business Source', null, null, false),
+ 'icon' => 'process-icon-back'
+ );
+ }
+ }
+
+ unset($this->toolbar_btn['back']);
+ parent::initPageHeaderToolbar();
+ }
+
+
+
+ protected function initBusinessSourcesList()
+ {
+ $this->fields_list = array(
+ 'id_business_source' => array(
+ 'title' => $this->l('ID'),
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs'
+ ),
+ 'name' => array(
+ 'title' => $this->l('Name'),
+ 'width' => 'auto',
+ 'filter_key' => 'b!name'
+ ),
+ 'code' => array(
+ 'title' => $this->l('Code'),
+ 'align' => 'text-center'
+ ),
+ 'position' => array(
+ 'title' => $this->l('Position'),
+ 'filter_key' => 'a!position',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'position' => 'position'
+ ),
+ 'orders_count' => array(
+ 'title' => $this->l('Orders (%)'),
+ 'align' => 'text-center',
+ 'orderby' => false,
+ 'search' => false,
+ 'callback' => 'formatOrdersPercentage',
+ ),
+ 'active' => array(
+ 'title' => $this->l('Enabled'),
+ 'active' => 'status',
+ 'type' => 'bool',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'orderby' => false
+ ),
+ );
+ }
+
+ protected function initSourcesList()
+ {
+ $this->fields_list = array(
+ 'id_source' => array(
+ 'title' => $this->l('ID'),
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs'
+ ),
+ 'name' => array(
+ 'title' => $this->l('Booking Source'),
+ 'width' => 'auto',
+ 'filter_key' => 'b!name'
+ ),
+ 'source_type_name' => array(
+ 'title' => $this->l('Business Source'),
+ 'orderby' => false,
+ 'search' => false,
+ ),
+ 'code' => array(
+ 'title' => $this->l('Code'),
+ 'align' => 'text-center'
+ ),
+ 'position' => array(
+ 'title' => $this->l('Position'),
+ 'filter_key' => 'a!position',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'position' => 'position'
+ ),
+ 'orders_count' => array(
+ 'title' => $this->l('Orders (%)'),
+ 'align' => 'text-center',
+ 'orderby' => false,
+ 'search' => false,
+ 'callback' => 'formatOrdersPercentage',
+ ),
+ 'active' => array(
+ 'title' => $this->l('Enabled'),
+ 'active' => 'status',
+ 'type' => 'bool',
+ 'align' => 'text-center',
+ 'class' => 'fixed-width-xs',
+ 'orderby' => false
+ ),
+ );
+ }
+
+ public function renderList()
+ {
+ $this->addRowAction('view');
+ $this->addRowAction('edit');
+ $this->addRowAction('delete');
+
+ $this->addRowActionSkipList('delete', BusinessSource::getUnremovableIds());
+ $this->_where = 'AND a.`deleted` = 0';
+ $this->_select = '(SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o
+ INNER JOIN `'._DB_PREFIX_.'source` s ON s.`id_source` = o.`id_source`
+ WHERE s.`id_business_source` = a.`id_business_source`) AS `orders_count`';
+ $this->ordersTotal = Source::getTotalOrderCount();
+ $this->initBusinessSourcesList();
+ $this->toolbar_title = $this->l('Business Source');
+
+ return parent::renderList();
+ }
+
+ public function renderView()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $objBusinessSource = new BusinessSource($idBusinessSource, (int)$this->context->language->id);
+ if (!Validate::isLoadedObject($objBusinessSource)) {
+ Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
+ }
+ $this->viewBusinessSource = $objBusinessSource;
+
+ $this->addRowAction('edit');
+ $this->addRowAction('merge');
+ $this->addRowAction('delete');
+ $this->addRowActionSkipList('delete', Source::getUnremovableIds());
+
+ $this->table = 'source';
+ $this->className = 'Source';
+ $this->identifier = 'id_source';
+ $this->list_id = 'source';
+ $this->_select = 'bsl.`name` AS `source_type_name`,
+ (SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o WHERE o.`id_source` = a.`id_source`) AS `orders_count`';
+ $this->ordersTotal = $objBusinessSource->getOrderCount();
+ $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'business_source` bs ON (bs.`id_business_source` = a.`id_business_source`)';
+ $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'business_source_lang` bsl ON (bsl.`id_business_source` = bs.`id_business_source` AND bsl.`id_lang` = '.(int)$this->context->language->id.')';
+ $this->_where = 'AND a.`deleted` = 0 AND a.`id_business_source` = '.(int)$objBusinessSource->id;
+ $this->initSourcesList();
+
+ $this->processFilter();
+ $list = parent::renderList();
+
+ $this->page_header_toolbar_title = $this->l('Business Source:').' '.$objBusinessSource->name;
+ $this->toolbar_title = $this->getSourcesListTitle();
+
+ return $list;
+ }
+
+ protected function getSourcesListTitle()
+ {
+ if (!Validate::isLoadedObject($this->viewBusinessSource)) {
+ return $this->l('Booking Sources');
+ }
+
+ return $this->viewBusinessSource->name.' '.$this->_listTotal.'';
+ }
+
+ public function getTemplateListVars()
+ {
+ $vars = parent::getTemplateListVars();
+
+ if ($this->display == 'view' && $this->table == 'source') {
+ $vars['title'] = $this->getSourcesListTitle();
+ }
+
+ return $vars;
+ }
+
+ public function renderForm()
+ {
+ if (Tools::isSubmit('updatesource')
+ || Tools::isSubmit('addsource')
+ || Tools::isSubmit('submitAddsource')
+ || Tools::isSubmit('submitAddsourceAndStay')
+ ) {
+ return $this->renderSourceForm();
+ }
+
+ return $this->renderBusinessSourceForm();
+ }
+
+ protected function renderBusinessSourceForm()
+ {
+ if (!($objBusinessSource = $this->loadObject(true))) {
+ return;
+ }
+
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Business Source'),
+ 'icon' => 'icon-edit'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'lang' => true,
+ 'required' => true,
+ 'hint' => $this->l('Invalid characters:').' <>;=#{}'
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Code'),
+ 'name' => 'code',
+ 'required' => true,
+ 'class' => 'fixed-width-xl',
+ 'readonly' => (bool)$objBusinessSource->id,
+ 'hint' => $objBusinessSource->id
+ ? $this->l('The code cannot be changed after creation.')
+ : $this->l('A short unique machine code, e.g. "OTA". Letters, numbers, underscores and hyphens only.')
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Enabled'),
+ 'name' => 'active',
+ 'required' => false,
+ 'class' => 't',
+ 'is_bool' => true,
+ 'default_value' => 1,
+ 'values' => array(
+ array('id' => 'active_on', 'value' => 1, 'label' => $this->l('Enabled')),
+ array('id' => 'active_off', 'value' => 0, 'label' => $this->l('Disabled')),
+ )
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ 'name' => 'submitAddbusiness_source'
+ ),
+ 'buttons' => array(
+ 'save-and-stay' => array(
+ 'title' => $this->l('Save and stay'),
+ 'name' => 'submitAddbusiness_sourceAndStay',
+ 'type' => 'submit',
+ 'class' => 'btn btn-default pull-right',
+ 'icon' => 'process-icon-save',
+ ),
+ ),
+ );
+
+ return parent::renderForm();
+ }
+
+ protected function renderSourceForm()
+ {
+ $this->table = 'source';
+ $this->className = 'Source';
+ $this->identifier = 'id_source';
+ $this->object = null;
+
+ if (!($objSource = $this->loadObject(true))) {
+ return;
+ }
+
+ $businessSources = BusinessSource::getActiveList((int)$this->context->language->id);
+ $isUnremovableSource = $objSource->id && in_array($objSource->id, Source::getUnremovableIds());
+
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Booking Source'),
+ 'icon' => 'icon-edit'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'lang' => true,
+ 'required' => true,
+ 'hint' => $this->l('Invalid characters:').' <>;=#{}'
+ ),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Business Source'),
+ 'name' => 'id_business_source',
+ 'required' => true,
+ 'options' => array(
+ 'query' => $businessSources,
+ 'id' => 'id_business_source',
+ 'name' => 'name',
+ ),
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Source Code'),
+ 'name' => 'code',
+ 'required' => true,
+ 'class' => 'fixed-width-xl',
+ 'readonly' => (bool)$objSource->id,
+ 'hint' => $objSource->id
+ ? $this->l('The code cannot be changed after creation.')
+ : $this->l('A short unique machine code, e.g. "BOOKING_COM". Letters, numbers, underscores and hyphens only.')
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Enabled'),
+ 'name' => 'active',
+ 'required' => false,
+ 'class' => 't',
+ 'is_bool' => true,
+ 'default_value' => 1,
+ 'disabled' => $isUnremovableSource,
+ 'hint' => $isUnremovableSource ? $this->l('Built-in Booking Sources cannot be disabled.') : null,
+ 'values' => array(
+ array('id' => 'active_on', 'value' => 1, 'label' => $this->l('Enabled')),
+ array('id' => 'active_off', 'value' => 0, 'label' => $this->l('Disabled')),
+ )
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ 'name' => 'submitAddsource'
+ ),
+ 'buttons' => array(
+ 'save-and-stay' => array(
+ 'title' => $this->l('Save and stay'),
+ 'name' => 'submitAddsourceAndStay',
+ 'type' => 'submit',
+ 'class' => 'btn btn-default pull-right',
+ 'icon' => 'process-icon-save',
+ ),
+ ),
+ );
+
+ return parent::renderForm();
+ }
+
+
+ public function postProcess()
+ {
+ if (Tools::isSubmit('submitAddsource') || Tools::isSubmit('submitAddsourceAndStay')) {
+ return $this->postProcessSource();
+ } elseif (Tools::isSubmit('submitMergeSource')) {
+ return $this->postProcessMergeSource();
+ } elseif (Tools::isSubmit('deletesource')) {
+ return $this->postProcessDeleteSource();
+ } elseif (Tools::isSubmit('statussource')) {
+ return $this->postProcessStatusSource();
+ } elseif (Tools::isSubmit('submitBulkenableSelectionsource')) {
+ return $this->processUpdateStatusBulk(1);
+ } elseif (Tools::isSubmit('submitBulkdisableSelectionsource')) {
+ return $this->processUpdateStatusBulk(0);
+ } elseif (Tools::isSubmit('submitBulkdeletesource')) {
+ return $this->postProcessBulkDeleteSource();
+ } elseif (Tools::isSubmit('submitAddbusiness_source') || Tools::isSubmit('submitAddbusiness_sourceAndStay')) {
+ return $this->postProcessBusinessSource();
+ } elseif (Tools::isSubmit('status'.$this->table)) {
+ return $this->postProcessStatusBusinessSource();
+ } elseif (Tools::isSubmit('delete'.$this->table)) {
+ return $this->postProcessDeleteBusinessSource();
+ } elseif (Tools::isSubmit('submitBulkdelete'.$this->table)) {
+ return $this->postProcessBulkDeleteBusinessSource();
+ } else {
+ return parent::postProcess();
+ }
+ }
+
+ protected function postProcessDeleteSource()
+ {
+ $objSource = new Source((int)Tools::getValue('id_source'));
+ if (!$objSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Booking Source.');
+ } elseif (!$objSource->delete()) {
+ $this->errors[] = Tools::displayError('An error occurred while deleting the Booking Source.');
+ } else {
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$objSource->id_business_source.'&conf=1&token='.$this->token);
+ }
+ }
+
+ protected function postProcessStatusSource()
+ {
+ if (Validate::isLoadedObject($objSource = new Source((int)Tools::getValue('id_source')))) {
+ $idBusinessSource = $objSource->id_business_source;
+ $newActive = !$objSource->active;
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if ($newActive && (!Validate::isLoadedObject($objBusinessSource) || !$objBusinessSource->active)) {
+ $this->errors[] = $this->l('You cannot enable this Booking Source because its Business Source is disabled.');
+ } else {
+ $objSource->active = $newActive;
+ if ($objSource->save()) {
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=5&token='.$this->token;
+ }
+ }
+ }
+ }
+
+ protected function postProcessStatusBusinessSource()
+ {
+ if (Validate::isLoadedObject($objBusinessSource = new BusinessSource((int)Tools::getValue('id_business_source')))) {
+ $newActive = !$objBusinessSource->active;
+ if (!$newActive && $objBusinessSource->hasUnremovableSource()) {
+ $this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
+ } else {
+ $objBusinessSource->active = $newActive;
+ if ($objBusinessSource->save()) {
+ $this->redirect_after = self::$currentIndex.'&token='.$this->token.'&conf=5';
+ }
+ }
+ }
+ }
+
+ protected function postProcessBulkDeleteSource()
+ {
+ $idBusinessSource = 0;
+ foreach (Tools::getValue('sourceBox') as $selection) {
+ $objSource = new Source((int)$selection);
+ $idBusinessSource = $objSource->id_business_source;
+ if (!$objSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Booking Source.');
+ break;
+ }
+ }
+
+ if (!count($this->errors)) {
+ $this->className = 'Source';
+ $this->table = 'source';
+ $this->boxes = Tools::getValue('sourceBox');
+ parent::processBulkDelete();
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=1&token='.$this->token;
+ }
+ }
+
+ protected function postProcessDeleteBusinessSource()
+ {
+ $objBusinessSource = new BusinessSource((int)Tools::getValue('id_business_source'));
+ if (!$objBusinessSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Business Source.');
+ } else {
+ return parent::postProcess();
+ }
+ }
+
+ protected function postProcessBulkDeleteBusinessSource()
+ {
+ foreach (Tools::getValue($this->table.'Box') as $selection) {
+ $objBusinessSource = new BusinessSource((int)$selection);
+ if (!$objBusinessSource->isRemovable()) {
+ $this->errors[] = $this->l('For security reasons, you cannot delete a built-in Business Source.');
+ break;
+ }
+ }
+
+ if (!count($this->errors)) {
+ return parent::postProcess();
+ }
+ }
+
+ protected function processUpdateStatusBulk($status = 1)
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $this->className = 'Source';
+ $this->table = 'source';
+ $this->boxes = Tools::getValue('sourceBox');
+ if(empty($this->boxes)){
+ $this->errors[] = $this->l('You must select at least one item to perform a bulk action.');
+ } elseif ($status) {
+ foreach ($this->boxes as $selection) {
+ $objSource = new Source((int)$selection);
+ $objBusinessSource = new BusinessSource($objSource->id_business_source);
+ if (!Validate::isLoadedObject($objBusinessSource) || !$objBusinessSource->active) {
+ $this->errors[] = $this->l('You cannot enable a Booking Source whose Business Source is disabled.');
+ break;
+ }
+ }
+ }
+ $this->display = 'view';
+ if(!$this->errors){
+ parent::processBulkStatusSelection($status);
+ $this->redirect_after = self::$currentIndex.'&viewbusiness_source&id_business_source='.(int)$idBusinessSource.'&conf=5&token='.$this->token;
+ }
+ }
+
+ protected function postProcessSource()
+ {
+ $idSource = (int)Tools::getValue('id_source');
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $objSource = new Source($idSource);
+ $sourceCode = $idSource ? $objSource->code : trim(Tools::getValue('code'));
+ $isUnremovableSource = $idSource && in_array($idSource, Source::getUnremovableIds());
+
+ $defaultLangId = Configuration::get('PS_LANG_DEFAULT');
+ $objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
+ $languages = Language::getLanguages(false);
+ if (!trim(Tools::getValue('name_'.$defaultLangId))) {
+ $this->errors[] = $this->l('Name is required at least in ').
+ $objDefaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
+ if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
+ $this->errors[] = $this->l('Invalid name in ').$lang['name'];
+ }
+ }
+ }
+ }
+
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if (!Validate::isLoadedObject($objBusinessSource) || $objBusinessSource->deleted) {
+ $this->errors[] = $this->l('Please select a valid Business Source.');
+ } elseif (!$isUnremovableSource && (int)Tools::getValue('active') && !$objBusinessSource->active) {
+ $this->errors[] = $this->l('You cannot enable this Booking Source because its Business Source is disabled.');
+ }
+
+ if (!$idSource) {
+ if (!$sourceCode || !Validate::isModuleName($sourceCode)) {
+ $this->errors[] = $this->l('Source Code is invalid. Only letters, numbers, underscores and hyphens are allowed.');
+ } elseif (Source::codeExists($sourceCode, $idSource)) {
+ $this->errors[] = $this->l('This Source Code is already used by another Booking Source.');
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->display = $idSource ? 'edit' : 'add';
+ return false;
+ }
+
+ $objSource->id_business_source = $idBusinessSource;
+ $objSource->code = $sourceCode;
+ $objSource->active = $isUnremovableSource ? $objSource->active : (int)Tools::getValue('active');
+ $objSource->name = array();
+ foreach (Language::getIDs(false) as $idLang) {
+ $objSource->name[$idLang] = Tools::getValue('name_'.$idLang);
+ }
+
+ if (!$objSource->save()) {
+ $this->errors[] = Tools::displayError('An error occurred while saving the Booking Source.');
+ $this->display = $idSource ? 'edit' : 'add';
+ return false;
+ }
+
+ if (Tools::isSubmit('submitAddsourceAndStay')) {
+ Tools::redirectAdmin(self::$currentIndex.'&updatesource&id_source='.$objSource->id.'&conf='.($idSource ? 4 : 3).'&token='.$this->token);
+ }
+
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.$idBusinessSource.'&conf='.($idSource ? 4 : 3).'&token='.$this->token);
+ }
+
+ protected function postProcessMergeSource()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $idCurrentSource = (int)Tools::getValue('current_source');
+ $idTargetSource = (int)Tools::getValue('target_source');
+
+ $objCurrent = new Source($idCurrentSource);
+ $objTarget = new Source($idTargetSource);
+
+ if (!Validate::isLoadedObject($objCurrent) || !Validate::isLoadedObject($objTarget)
+ || (int)$objCurrent->id_business_source !== $idBusinessSource || (int)$objTarget->id_business_source !== $idBusinessSource
+ ) {
+ $this->errors[] = $this->l('Please select valid Current and Target Booking Sources.');
+ } elseif ($idCurrentSource === $idTargetSource) {
+ $this->errors[] = $this->l('Current and Target Booking Source cannot be the same.');
+ } else {
+ $objCurrent->mergeOrdersInto($idTargetSource);
+ }
+ $this->display = 'view';
+ if (!count($this->errors)) {
+ Tools::redirectAdmin(self::$currentIndex.'&viewbusiness_source&id_business_source='.$idBusinessSource.'&conf=4&token='.$this->token);
+ }
+ }
+
+ protected function postProcessBusinessSource()
+ {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ if ($idBusinessSource) {
+ $sourceTypeCode = (new BusinessSource($idBusinessSource))->code;
+ $_POST['code'] = $sourceTypeCode;
+ } else {
+ $sourceTypeCode = trim(Tools::getValue('code'));
+ }
+
+ $defaultLangId = Configuration::get('PS_LANG_DEFAULT');
+ $objDefaultLanguage = Language::getLanguage((int) $defaultLangId);
+ $languages = Language::getLanguages(false);
+ if (!trim(Tools::getValue('name_'.$defaultLangId))) {
+ $this->errors[] = $this->l('Name is required at least in ').
+ $objDefaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ if (trim(Tools::getValue('name_'.$lang['id_lang']))) {
+ if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) {
+ $this->errors[] = $this->l('Invalid name in ').$lang['name'];
+ }
+ }
+ }
+ }
+ if (!$idBusinessSource) {
+ if (!$sourceTypeCode || !Validate::isModuleName($sourceTypeCode)) {
+ $this->errors[] = $this->l('Code is invalid. Only letters, numbers, underscores and hyphens are allowed.');
+ } elseif (BusinessSource::codeExists($sourceTypeCode, $idBusinessSource)) {
+ $this->errors[] = $this->l('This Code is already used by another Business Source.');
+ }
+ }
+
+ if ($idBusinessSource && !(int)Tools::getValue('active')) {
+ $objBusinessSource = new BusinessSource($idBusinessSource);
+ if ($objBusinessSource->hasUnremovableSource()) {
+ $this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
+ }
+ }
+
+ if (count($this->errors)) {
+ $this->display = $idBusinessSource ? 'edit' : 'add';
+ return false;
+ }
+
+ return parent::postProcess();
+ }
+
+ public function formatOrdersPercentage($count, $row)
+ {
+ $percentage = $this->ordersTotal ? round(((int)$count / $this->ordersTotal) * 100, 1) : 0;
+ return $percentage.'%';
+ }
+
+ public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null, $ajax = false)
+ {
+ if ($this->table == 'source' && in_array((int)$id, Source::getUnremovableIds())) {
+ return '
+
+ ';
+ }
+
+ $helper = new HelperList();
+ $helper->token = $this->token;
+ $helper->currentIndex = self::$currentIndex;
+ $helper->table = $this->table;
+ $helper->identifier = $this->identifier;
+
+ return $helper->displayEnableLink($token, $id, $value, $active, $id_category, $id_product, $ajax);
+ }
+
+ public function displayMergeLink($token, $id, $name = null)
+ {
+ $idBusinessSource = (int) Tools::getValue('id_business_source');
+
+ return '
+ ' . $this->l('Merge') . '
+ ';
+ }
+
+ public function ajaxProcessInitMergeSourceModal()
+ {
+ $response = array('hasError' => 1);
+
+ if ($this->tabAccess['edit'] === 1) {
+ $idBusinessSource = (int)Tools::getValue('id_business_source');
+ $idSource = (int)Tools::getValue('id_source');
+ $objSource = new Source($idSource,(int)$this->context->language->id);
+ if (Validate::isLoadedObject($objSource) && (int)$objSource->id_business_source === $idBusinessSource) {
+ $this->context->smarty->assign(array(
+ 'sources' => Source::getActiveSource($idBusinessSource, $idSource, (int)$this->context->language->id),
+ 'current_source' => $objSource,
+ 'id_business_source' => $idBusinessSource,
+ 'current_index' => self::$currentIndex,
+ 'token' => $this->token,
+ ));
+
+ $this->context->smarty->assign(array(
+ 'modal_id' => 'merge_source_modal',
+ 'modal_class' => 'modal-md',
+ 'modal_title' => ' ' .$this->l('Merge Booking Source'),
+ 'modal_content' => $this->context->smarty->fetch('controllers/sources/modals/_merge_source_form.tpl'),
+ ));
+
+ $response['hasError'] = 0;
+ $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl');
+ }
+ }
+
+ die(Tools::jsonEncode($response));
+ }
+
+ protected function filterToField($key, $filter)
+ {
+ if ($this->table == 'source') {
+ $this->initSourcesList();
+ } else {
+ $this->initBusinessSourcesList();
+ }
+
+ return parent::filterToField($key, $filter);
+ }
+
+ public function ajaxProcessUpdatePositions()
+ {
+ if ($this->tabAccess['edit'] !== 1) {
+ die(json_encode(array('hasError' => true, 'errors' => $this->l('You do not have permission to edit this.'))));
+ }
+
+ $way = (int)Tools::getValue('way');
+ $id = (int)Tools::getValue('id');
+
+ if ($positions = Tools::getValue('source')) {
+ $className = 'Source';
+ } elseif ($positions = Tools::getValue('source_type')) {
+ $className = 'BusinessSource';
+ } else {
+ die(json_encode(array('hasError' => true, 'errors' => 'Unknown table for position update.')));
+ }
+
+ foreach ($positions as $position => $value) {
+ $pos = explode('_', $value);
+
+ if (isset($pos[2]) && (int)$pos[2] === $id) {
+ if ($object = new $className((int)$pos[2])) {
+ if (isset($position) && $object->updatePosition($way, $position)) {
+ echo 'ok position '.(int)$position.' for '.$className.' '.$id;
+ } else {
+ echo '{"hasError" : true, "errors" : "Can not update tab '.(int)$id.' to position '.(int)$position.' "}';
+ }
+ } else {
+ echo json_encode(array(
+ 'hasError' => true,
+ 'errors' => 'Can not update '.$className.' '.$id.' to position '.(int)$position,
+ ));
+ }
+
+ break;
+ }
+ }
+ }
+}
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index d3933c954..78d01aca8 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -1909,7 +1909,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
return $result;
}
- // Calculate total services revenue (services and demands)
+ // Calculate total services revenue (services )
public static function getServicesRevenueForDiscreteDates($dateFrom, $dateTo = null, $idHotel = null, $useCache = true)
{
$dateTo = !$dateTo ? date('Y-m-d', strtotime('+1 day', strtotime($dateFrom))) : $dateTo;
@@ -1946,23 +1946,6 @@ class AdminStatsControllerCore extends AdminStatsTabController
$totalServicesRevenue += $servicesRevenue;
}
- // Calculate demands revenue
- $demandsRevenueSql = 'SELECT SUM((hdmd.`total_price_tax_excl` / o.`conversion_rate`) / DATEDIFF(hbd.`date_to`, hbd.`date_from`))
- FROM `'._DB_PREFIX_.'htl_booking_demands` hdmd
- LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd
- ON (hdmd.`id_htl_booking` = hbd.`id`)
- LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hbd.`id_product`)
- LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
- WHERE p.`active` = 1
- AND o.`valid` = 1
- AND hbd.`is_refunded` = 0
- AND hbd.`date_from` < "'.pSQL($discreteDate['date_to']).' 00:00:00" AND hbd.`date_to` > "'.pSQL($discreteDate['date_from']).' 00:00:00"'.
- (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '');
-
- if ($demandsRevenue = Db::getInstance()->getValue($demandsRevenueSql)) {
- $totalServicesRevenue += $demandsRevenue;
- }
-
$result[$discreteDate['timestamp_from']] = $totalServicesRevenue;
}
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index 894e7f257..6dd6566bf 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -96,6 +96,59 @@ class AdminTaxRulesGroupControllerCore extends AdminController
return parent::renderList();
}
+ /**
+ * Return taxes for the rule-form dropdown, filtered by whether this TRG is a tourism group.
+ *
+ * @return array
+ */
+ protected function getTaxOptionsForGroup()
+ {
+ $idTaxRulesGroup = (int) Tools::getValue('id_tax_rules_group');
+ $isTourism = false;
+ if ($idTaxRulesGroup) {
+ $taxRulesGroup = new TaxRulesGroup($idTaxRulesGroup);
+ if (Validate::isLoadedObject($taxRulesGroup)) {
+ $isTourism = (bool) $taxRulesGroup->is_tourism_tax_rule_group;
+ }
+ }
+
+ $idLang = (int) $this->context->language->id;
+ $sql = new DbQuery();
+ if ($isTourism) {
+ $sql->select(
+ 't.`id_tax`, tl.`name`,'
+ . ' IFNULL(tourism_tax.`calculation_type`, 0) AS tourism_tax_calc_type,'
+ . ' IFNULL(tourism_tax.`tax_value`, 0) AS tourism_tax_value'
+ );
+ } else {
+ $sql->select('t.`id_tax`, tl.`name`, t.`rate`');
+ }
+ $sql->from('tax', 't');
+ $sql->leftJoin('tax_lang', 'tl', 't.`id_tax` = tl.`id_tax` AND tl.`id_lang` = ' . $idLang);
+ if ($isTourism) {
+ $sql->leftJoin('tax_configuration', 'tourism_tax', 'tourism_tax.`id_tax` = t.`id_tax`');
+ }
+ $sql->where('t.`deleted` != 1 AND t.`active` = 1');
+ $sql->where('t.`is_tourism_tax` = ' . ($isTourism ? 1 : 0));
+ $sql->orderBy('tl.`name` ASC');
+
+ $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+
+ if ($isTourism && is_array($rows)) {
+ $currency = $this->context->currency;
+ $currencySign = Tools::safeOutput(trim($currency->prefix . $currency->suffix));
+ foreach ($rows as &$row) {
+ $typeLabel = ((int) $row['tourism_tax_calc_type'] === TaxConfiguration::CALCULATION_TYPE_PERCENTAGE)
+ ? (float) $row['tourism_tax_value'] . '%'
+ : $currencySign . ' ' . (float) $row['tourism_tax_value'];
+ $row['name'] = $row['name'] . ' (' . $typeLabel . ')';
+ }
+ unset($row);
+ }
+
+ return $rows;
+ }
+
public function initRulesList($id_group)
{
$this->table = 'tax_rule';
@@ -127,7 +180,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController
),
'rate' => array(
'title' => $this->l('Tax'),
- 'class' => 'fixed-width-sm'
+ 'class' => 'fixed-width-sm',
+ 'callback' => 'displayTaxRuleRate',
+ 'orderby' => false,
+ 'search' => false,
),
'description' => array(
'title' => $this->l('Description')
@@ -141,7 +197,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController
c.`name` AS country_name,
s.`name` AS state_name,
CONCAT_WS(" - ", a.`zipcode_from`, a.`zipcode_to`) AS zipcode,
- t.rate';
+ t.`rate`,
+ t.`is_tourism_tax`,
+ IFNULL(tourism_tax.`calculation_type`, 0) AS tourism_tax_calc_type,
+ IFNULL(tourism_tax.`tax_value`, 0) AS tourism_tax_value';
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'country_lang` c
@@ -149,7 +208,9 @@ class AdminTaxRulesGroupControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'state` s
ON (a.`id_state` = s.`id_state`)
LEFT JOIN `'._DB_PREFIX_.'tax` t
- ON (a.`id_tax` = t.`id_tax`)';
+ ON (a.`id_tax` = t.`id_tax`)
+ LEFT JOIN `'._DB_PREFIX_.'tax_configuration` tourism_tax
+ ON (tourism_tax.`id_tax` = t.`id_tax`)';
$this->_where = 'AND `id_tax_rules_group` = '.(int)$id_group;
$this->_use_found_rows = false;
@@ -194,7 +255,19 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'label' => $this->l('Disabled')
)
)
- )
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Tourism tax rule group'),
+ 'name' => 'is_tourism_tax_rule_group',
+ 'required' => false,
+ 'is_bool' => true,
+ 'hint' => $this->l('Mark this group as tourism-only. All tax rules added here must reference tourism taxes.'),
+ 'values' => array(
+ array('id' => 'is_tourism_tax_rule_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'is_tourism_tax_rule_off', 'value' => 0, 'label' => $this->l('No')),
+ )
+ ),
),
'submit' => array(
'title' => $this->l('Save and stay'),
@@ -309,7 +382,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->l('- This tax only: Will apply only this tax').'
',
$this->l('- Combine: Combine taxes (e.g.: 10% + 5% = 15%)').'
',
$this->l('- One after another: Apply taxes one after another (e.g.: 0 + 10% = 0 + 5% = 5.5)')
- )
+ ),
),
array(
'type' => 'select',
@@ -317,7 +390,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'name' => 'id_tax',
'required' => false,
'options' => array(
- 'query' => Tax::getTaxes((int)$this->context->language->id),
+ 'query' => $this->getTaxOptionsForGroup(),
'id' => 'id_tax',
'name' => 'name',
'default' => array(
@@ -325,7 +398,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'label' => $this->l('No Tax')
)
),
- 'hint' => sprintf($this->l('(Total tax: %s)'), '9%')
+ 'hint' => $this->l('Select the tax to apply for this rule.')
),
array(
'type' => 'text',
@@ -374,6 +447,75 @@ class AdminTaxRulesGroupControllerCore extends AdminController
}
+ /**
+ * List column callback: render the Tax column in the tax rules list.
+ * Tourism-fixed taxes show the currency sign; tourism-percent and regular VAT taxes show %.
+ *
+ * @param mixed $value t.rate (always 0 for tourism taxes)
+ * @param array $row Full list row — includes is_tourism_tax, tourism_tax_calc_type, tourism_tax_value
+ * @return string
+ */
+ public function displayTaxRuleRate($value, $row)
+ {
+ return TaxConfiguration::getFormattedRateForDisplay($value, $row, $this->context->currency);
+ }
+
+ public function postProcess()
+ {
+ if ($this->action == 'save') {
+ $idGroup = (int) Tools::getValue('id_tax_rules_group');
+ $newIsTourism = (int) Tools::getValue('is_tourism_tax_rule_group');
+
+ if ($idGroup) {
+ $taxRulesGroup = new TaxRulesGroup($idGroup);
+ if (Validate::isLoadedObject($taxRulesGroup)) {
+ $oldIsTourism = (int) $taxRulesGroup->is_tourism_tax_rule_group;
+
+ if ($oldIsTourism && !$newIsTourism) {
+ if ($taxRulesGroup->hasTourismTaxRules()) {
+ $this->errors[] = $this->l(
+ 'Cannot convert this to a VAT group: it still contains tourism taxes. Remove the tourism tax rules first.'
+ );
+ $_POST['is_tourism_tax_rule_group'] = $oldIsTourism;
+ $this->display = 'edit';
+ return;
+ }
+
+ if ($taxRulesGroup->hasProductsUsingAsTourismGroup()) {
+ $this->errors[] = $this->l(
+ 'Cannot convert this to a VAT group: one or more products still use it as their tourism tax rule. Reassign them first.'
+ );
+ $_POST['is_tourism_tax_rule_group'] = $oldIsTourism;
+ $this->display = 'edit';
+ return;
+ }
+ }
+
+ if (!$oldIsTourism && $newIsTourism) {
+ if ($taxRulesGroup->hasVatTaxRules()) {
+ $this->errors[] = $this->l(
+ 'Cannot convert this to a tourism group: it still contains VAT taxes. Remove the VAT tax rules first.'
+ );
+ $_POST['is_tourism_tax_rule_group'] = $oldIsTourism;
+ $this->display = 'edit';
+ return;
+ }
+
+ if ($taxRulesGroup->hasProductsUsingAsVatGroup()) {
+ $this->errors[] = $this->l(
+ 'Cannot convert this to a tourism group: one or more products or services still use it as their regular tax rule. Reassign them first.'
+ );
+ $_POST['is_tourism_tax_rule_group'] = $oldIsTourism;
+ $this->display = 'edit';
+ return;
+ }
+ }
+ }
+ }
+ }
+ parent::postProcess();
+ }
+
public function initProcess()
{
if (Tools::isSubmit('deletetax_rule')) {
@@ -430,27 +572,27 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->errors[] = Tools::displayError('A tax rule already exists for this country/state with tax only behavior.');
continue;
}
- $tr = new TaxRule();
+ $taxRule = new TaxRule();
// update or creation?
if (isset($id_rule) && $first) {
- $tr->id = $id_rule;
+ $taxRule->id = $id_rule;
$first = false;
}
- $tr->id_tax = $id_tax;
+ $taxRule->id_tax = $id_tax;
$tax_rules_group = new TaxRulesGroup((int)$id_tax_rules_group);
- $tr->id_tax_rules_group = (int)$tax_rules_group->id;
- $tr->id_country = (int)$id_country;
- $tr->id_state = (int)$id_state;
- list($tr->zipcode_from, $tr->zipcode_to) = $tr->breakDownZipCode($zip_code);
+ $taxRule->id_tax_rules_group = (int)$tax_rules_group->id;
+ $taxRule->id_country = (int)$id_country;
+ $taxRule->id_state = (int)$id_state;
+ list($taxRule->zipcode_from, $taxRule->zipcode_to) = $taxRule->breakDownZipCode($zip_code);
// Construct Object Country
$country = new Country((int)$id_country, (int)$this->context->language->id);
if ($zip_code && $country->need_zip_code) {
if ($country->zip_code_format) {
- foreach (array($tr->zipcode_from, $tr->zipcode_to) as $zip_code) {
+ foreach (array($taxRule->zipcode_from, $taxRule->zipcode_to) as $zip_code) {
if ($zip_code) {
if (!$country->checkZipCode($zip_code)) {
$this->errors[] = sprintf(
@@ -463,19 +605,19 @@ class AdminTaxRulesGroupControllerCore extends AdminController
}
}
- $tr->behavior = (int)$behavior;
- $tr->description = $description;
- $this->tax_rule = $tr;
- $_POST['id_state'] = $tr->id_state;
+ $taxRule->behavior = (int)$behavior;
+ $taxRule->description = $description;
+ $this->tax_rule = $taxRule;
+ $_POST['id_state'] = $taxRule->id_state;
- $this->errors = array_merge($this->errors, $this->validateTaxRule($tr));
+ $this->errors = array_merge($this->errors, $this->validateTaxRule($taxRule));
if (count($this->errors) == 0) {
$tax_rules_group = $this->updateTaxRulesGroup($tax_rules_group);
- $tr->id = (int)$tax_rules_group->getIdTaxRuleGroupFromHistorizedId((int)$tr->id);
- $tr->id_tax_rules_group = (int)$tax_rules_group->id;
+ $taxRule->id = (int)$tax_rules_group->getIdTaxRuleGroupFromHistorizedId((int)$taxRule->id);
+ $taxRule->id_tax_rules_group = (int)$tax_rules_group->id;
- if (!$tr->save()) {
+ if (!$taxRule->save()) {
$this->errors[] = Tools::displayError('An error has occurred: Cannot save the current tax rule.');
}
}
@@ -525,14 +667,14 @@ class AdminTaxRulesGroupControllerCore extends AdminController
/**
* Check if the tax rule could be added in the database
*
- * @param TaxRule $tr
+ * @param TaxRule $taxRule
*
* @return array
*/
- protected function validateTaxRule(TaxRule $tr)
+ protected function validateTaxRule(TaxRule $taxRule)
{
// @TODO: check if the rule already exists
- return $tr->validateController();
+ return $taxRule->validateController();
}
protected function displayAjaxUpdateTaxRule()
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index ca2787e05..1f2433087 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -29,6 +29,11 @@
*/
class AdminTaxesControllerCore extends AdminController
{
+ protected $invalidCoreFields = array();
+ protected $invalidTierFields = array();
+ protected $invalidChildFields = array();
+ protected $invalidValidityFields = array();
+
public function __construct()
{
$this->bootstrap = true;
@@ -49,14 +54,29 @@ class AdminTaxesControllerCore extends AdminController
$this->fields_list = array(
'id_tax' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
- 'rate' => array('title' => $this->l('Rate'), 'align' => 'center', 'suffix' => '%' , 'class' => 'fixed-width-md'),
+ 'is_tourism_tax' => array(
+ 'title' => $this->l('Tourism Tax'),
+ 'align' => 'center',
+ 'class' => 'fixed-width-sm',
+ 'callback' => 'displayTourismTaxBadge',
+ 'orderby' => false,
+ 'type' => 'bool',
+ ),
+ 'rate' => array(
+ 'title' => $this->l('Rate'),
+ 'align' => 'center',
+ 'class' => 'fixed-width-md',
+ 'callback' => 'displayRate',
+ 'orderby' => false,
+ ),
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false, 'class' => 'fixed-width-sm', 'remove_onclick' => true)
);
- $ecotax_desc = '';
- if (Configuration::get('PS_USE_ECOTAX')) {
- $ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0.');
- }
+ // Code For eco-tax working
+ // $ecotax_desc = '';
+ // if (Configuration::get('PS_USE_ECOTAX')) {
+ // $ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0.');
+ // }
$this->fields_options = array(
'general' => array(
@@ -87,32 +107,55 @@ class AdminTaxesControllerCore extends AdminController
// ),
// 'identifier' => 'id'
// ),
- 'PS_USE_ECOTAX' => array(
- 'title' => $this->l('Use ecotax'),
- 'desc' => $ecotax_desc,
- 'validation' => 'isBool',
- 'cast' => 'intval',
- 'type' => 'bool'
- ),
+ // Code For eco-tax working
+ // 'PS_USE_ECOTAX' => array(
+ // 'title' => $this->l('Use ecotax'),
+ // 'desc' => $ecotax_desc,
+ // 'validation' => 'isBool',
+ // 'cast' => 'intval',
+ // 'type' => 'bool'
+ // ),
),
'submit' => array('title' => $this->l('Save'))
),
);
- if (Configuration::get('PS_USE_ECOTAX') || Tools::getValue('PS_USE_ECOTAX')) {
- $this->fields_options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array(
- 'title' => $this->l('Ecotax'),
- 'hint' => $this->l('Define the ecotax (e.g. French ecotax: 19.6%).'),
+ // Code For eco-tax working
+ // if (Configuration::get('PS_USE_ECOTAX') || Tools::getValue('PS_USE_ECOTAX')) {
+ // $this->fields_options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array(
+ // 'title' => $this->l('Ecotax'),
+ // 'hint' => $this->l('Define the ecotax (e.g. French ecotax: 19.6%).'),
+ // 'cast' => 'intval',
+ // 'type' => 'select',
+ // 'identifier' => 'id_tax_rules_group',
+ // 'list' => TaxRulesGroup::getTaxRulesGroupsForOptions()
+ // );
+ // }
+
+ $this->fields_options['general']['fields']['QLO_USE_TOURISM_TAX'] = array(
+ 'title' => $this->l('Use tourism tax'),
+ 'hint' => $this->l('Enable tourism tax calculation for hotel room bookings.'),
+ 'validation' => 'isBool',
+ 'cast' => 'intval',
+ 'type' => 'bool',
+ );
+
+ if (Configuration::get('QLO_USE_TOURISM_TAX') || Tools::getValue('QLO_USE_TOURISM_TAX')) {
+ $this->fields_options['general']['fields']['QLO_TOURISM_TAX_GROSSED_UP'] = array(
+ 'title' => $this->l('Include tourism tax in displayed prices'),
+ 'desc' => $this->l('When enabled, tourism tax is included in displayed prices. The applicable tourism tax is always shown as a separate line if applicable.'),
+ 'validation' => 'isBool',
'cast' => 'intval',
- 'type' => 'select',
- 'identifier' => 'id_tax_rules_group',
- 'list' => TaxRulesGroup::getTaxRulesGroupsForOptions()
- );
+ 'type' => 'bool',
+ );
}
parent::__construct();
$this->_where .= ' AND a.deleted = 0';
+ $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'tax_configuration` tourism_tax ON tourism_tax.`id_tax` = a.`id_tax`';
+ $extraSelect = 'IFNULL(tourism_tax.`calculation_type`, 0) AS `tourism_tax_calc_type`, IFNULL(tourism_tax.`tax_value`, 0) AS `tourism_tax_value`';
+ $this->_select = ($this->_select ? $this->_select . ', ' : '') . $extraSelect;
}
public function initPageHeaderToolbar()
@@ -187,30 +230,375 @@ class AdminTaxesControllerCore extends AdminController
return $tpl_enable->fetch();
}
+ public function renderList()
+ {
+ $this->_new_list_header_design = true;
+
+ return parent::renderList();
+ }
+
public function renderForm()
{
+ $idTax = (int) Tools::getValue('id_' . $this->table);
+ $subtype = null;
+ $tiers = array();
+ $childRanges = array();
+ $validityRanges = array();
+ $contextCurrency = $this->context->currency;
+ $currencySign = Tools::safeOutput(trim($contextCurrency->prefix . $contextCurrency->suffix));
+
+ $isAnySubmit = Tools::isSubmit('submitAdd' . $this->table) || Tools::isSubmit('submitAdd' . $this->table . 'AndStay');
+
+ if ($idTax && !$isAnySubmit) {
+ $subtype = TaxConfiguration::getByTaxId($idTax);
+ if ($subtype) {
+ $_POST['tax_calc_type'] = $subtype->calculation_type;
+ $_POST['is_per_night'] = $subtype->per_night;
+ $_POST['is_per_person'] = $subtype->per_person;
+ $_POST['tax_value'] = $subtype->tax_value;
+ $_POST['is_tiered'] = $subtype->has_tiered_pricing;
+ $_POST['has_child_rate'] = $subtype->apply_on_child;
+ $_POST['has_child_age_range'] = $subtype->has_child_age_range;
+ $_POST['child_calc_type'] = $subtype->child_calculation_type;
+ $_POST['has_multiple_valid_ranges'] = $subtype->has_multiple_valid_ranges;
+
+ $tiers = TaxPriceTier::getByTaxId($idTax);
+ $childRanges = TaxChildRange::getByTaxId($idTax);
+ $validityRanges = TaxValidityRange::getByTaxId($idTax);
+ }
+ } elseif ($isAnySubmit) {
+ $postTierIds = (array) Tools::getValue('tier_id', array());
+ $postTierMins = (array) Tools::getValue('tier_min', array());
+ $postTierMaxs = (array) Tools::getValue('tier_max', array());
+ $postTierValues = (array) Tools::getValue('tier_value', array());
+ foreach ($postTierIds as $tierRowIndex => $tierId) {
+ $tiers[] = array(
+ 'id_tier' => (int) $tierId,
+ 'min_amount' => isset($postTierMins[$tierRowIndex]) ? $postTierMins[$tierRowIndex] : '',
+ 'max_amount' => isset($postTierMaxs[$tierRowIndex]) ? $postTierMaxs[$tierRowIndex] : '',
+ 'tax_value' => isset($postTierValues[$tierRowIndex]) ? $postTierValues[$tierRowIndex] : '',
+ );
+ }
+
+ $postChildIds = (array) Tools::getValue('child_id', array());
+ $postChildMins = (array) Tools::getValue('child_min', array());
+ $postChildMaxs = (array) Tools::getValue('child_max', array());
+ $postChildValues = (array) Tools::getValue('child_value', array());
+ foreach ($postChildIds as $childRangeRowIndex => $childId) {
+ $childRanges[] = array(
+ 'id_child_range' => (int) $childId,
+ 'min_age' => isset($postChildMins[$childRangeRowIndex]) ? $postChildMins[$childRangeRowIndex] : '',
+ 'max_age' => isset($postChildMaxs[$childRangeRowIndex]) ? $postChildMaxs[$childRangeRowIndex] : '',
+ 'tax_value' => isset($postChildValues[$childRangeRowIndex]) ? $postChildValues[$childRangeRowIndex] : '',
+ );
+ }
+
+ $postValidityIds = (array) Tools::getValue('validity_id', array());
+ $postValidityFroms = (array) Tools::getValue('validity_from', array());
+ $postValidityTos = (array) Tools::getValue('validity_to', array());
+ foreach ($postValidityIds as $validityRangeRowIndex => $rangeId) {
+ $validityRanges[] = array(
+ 'id_validity_range' => (int) $rangeId,
+ 'valid_from' => isset($postValidityFroms[$validityRangeRowIndex]) ? $postValidityFroms[$validityRangeRowIndex] : '',
+ 'valid_to' => isset($postValidityTos[$validityRangeRowIndex]) ? $postValidityTos[$validityRangeRowIndex] : '',
+ );
+ }
+ }
+
+ $taxType = (int) Tools::getValue('tax_calc_type', 0);
+ $baseTaxValue = Tools::getValue('tax_value', $subtype ? $subtype->tax_value : 0);
+ $allDayKeys = TaxConfiguration::DAY_KEYS;
+ if ($subtype && $subtype->special_days) {
+ $defaultSpecialDays = json_decode($subtype->special_days, true) ?: $allDayKeys;
+ } else {
+ $defaultSpecialDays = $allDayKeys;
+ }
+ $specialDaysChecked = Tools::getValue('valid_days', $defaultSpecialDays);
+ if (!is_array($specialDaysChecked)) {
+ $specialDaysChecked = $allDayKeys;
+ }
+
+ $initialTypeSign = ($taxType == TaxConfiguration::CALCULATION_TYPE_PERCENTAGE) ? '%' : $currencySign;
+ $taxValueInputHtml = '
+
+ ' . $initialTypeSign . '
+
+ ';
+ $rateCurrentValue = (float) Tools::getValue('rate', (isset($this->object) && $this->object) ? $this->object->rate : 0);
+ $rateInputHtml = '
+
+ %
+
+ ';
+ $priceBracketsHtml = '
+
| + + | ++ + | ++ + | +-- | +
|---|---|---|---|
| + + | ++ + | +
+
+
+
+
+ |
+ + + + + + | +
+
+ ';
+
+ $infantMaxAge = (int) Configuration::get('QLO_GLOBAL_MAX_INFANT_AGE');
+ $childMaxAge = (int) Configuration::get('WK_GLOBAL_CHILD_MAX_AGE');
+
+ $ageBandsHtml = '
+
+
+
+ | + + | ++ + | ++ + | +-- | +
|---|---|---|---|
| + + | ++ + | +
+
+
+
+
+ |
+ + + + + + | +
+
+ ';
+
+ $validityRangesHtml = '
+
+
+
+ | + | + | -- | +
|---|---|---|
|
+
+
+
+
+ |
+
+
+
+
+
+ |
+ + + + + + | +
+
+ ';
+
+ $weekdayLabels = array(
+ 'mon' => $this->l('Mon'), 'tue' => $this->l('Tue'), 'wed' => $this->l('Wed'),
+ 'thu' => $this->l('Thu'), 'fri' => $this->l('Fri'), 'sat' => $this->l('Sat'),
+ 'sun' => $this->l('Sun'),
+ );
+
+ $weekdayCheckboxesHtml = '
+
+
+ ';
+ foreach ($weekdayLabels as $dayKey => $label) {
+ $checked = in_array($dayKey, $specialDaysChecked) ? ' checked="checked"' : '';
+ $weekdayCheckboxesHtml .= '
+ ';
+ }
+ $weekdayCheckboxesHtml .= '
';
+
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Taxes'),
- 'icon' => 'icon-money'
+ 'icon' => 'icon-money',
),
'input' => array(
- array(
- 'type' => 'text',
- 'label' => $this->l('Name'),
- 'name' => 'name',
- 'required' => true,
- 'lang' => true,
- 'hint' => $this->l('Tax name to display in carts and on invoices (e.g. "VAT").').' - '.$this->l('Invalid characters').' <>;=#{}'
- ),
- array(
- 'type' => 'text',
- 'label' => $this->l('Rate'),
- 'name' => 'rate',
- 'maxlength' => 6,
- 'required' => true,
- 'hint' => $this->l('Format: XX.XX or XX.XXX (e.g. 19.60 or 13.925)').' - '.$this->l('Invalid characters').' <>;=#{}'
- ),
array(
'type' => 'switch',
'label' => $this->l('Enable'),
@@ -229,15 +617,195 @@ class AdminTaxesControllerCore extends AdminController
'label' => $this->l('Disabled')
)
)
- )
- ),
- 'submit' => array(
- 'title' => $this->l('Save')
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'required' => true,
+ 'lang' => true,
+ 'col' => 4,
+ 'hint' => $this->l('Tax name to display in carts and on invoices (e.g. "City Tax").')
+ . ' - ' . $this->l('Invalid characters') . ' <>;=#{}',
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Rate'),
+ 'name' => 'rate_wrap',
+ 'html_content' => $rateInputHtml,
+ 'hint' => $this->l('Format: XX.XX or XX.XXX (e.g. 19.60 or 13.925)')
+ . ' - ' . $this->l('Invalid characters') . ' <>;=#{}',
+ 'form_group_class' => 'tourism-tax-non-tourism',
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Is tourism tax'),
+ 'name' => 'is_tourism_tax',
+ 'is_bool' => true,
+ 'hint' => $this->l('When enabled, this tax will be used for tourism tax purposes only.'),
+ 'values' => array(
+ array('id' => 'is_tourism_tax_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'is_tourism_tax_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Tax Calculation Type'),
+ 'name' => 'tax_calc_type',
+ 'form_group_class' => 'tourism-tax-field',
+ 'options' => array(
+ 'query' => array(
+ array('id' => 0, 'name' => $this->l('Fixed amount')),
+ array('id' => 1, 'name' => $this->l('Percentage')),
+ ),
+ 'id' => 'id',
+ 'name' => 'name',
+ ),
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Tax value'),
+ 'name' => 'tax_value_wrap',
+ 'required' => true,
+ 'html_content' => $taxValueInputHtml,
+ 'form_group_class' => 'tourism-tax-field',
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Per night'),
+ 'name' => 'is_per_night',
+ 'is_bool' => true,
+ 'hint' => $this->l('When enabled, the tax amount applies for each night of the booking instead of once per booking.'),
+ 'form_group_class' => 'tourism-tax-field',
+ 'default_value' => 1,
+ 'values' => array(
+ array('id' => 'per_night_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'per_night_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Per occupancy'),
+ 'name' => 'is_per_person',
+ 'is_bool' => true,
+ 'hint' => $this->l('When enabled, the tax amount multiplies by the number of adult occupants.'),
+ 'form_group_class' => 'tourism-tax-field',
+ 'values' => array(
+ array('id' => 'per_person_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'per_person_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Apply on child'),
+ 'name' => 'has_child_rate',
+ 'is_bool' => true,
+ 'hint' => sprintf(
+ $this->l('When enabled, children pay the adult rate by default (default child age ranges %d–%d according to current general settings.'),
+ $infantMaxAge,
+ $childMaxAge - 1
+ ),
+ 'form_group_class' => 'tourism-tax-field',
+ 'values' => array(
+ array('id' => 'child_rate_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'child_rate_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Set child age range'),
+ 'name' => 'has_child_age_range',
+ 'is_bool' => true,
+ 'desc' => $this->l('When enabled, define a set of child age bands below, each with its own tax value.'),
+ 'form_group_class' => 'tourism-tax-field tourism-tax-child-field',
+ 'values' => array(
+ array('id' => 'child_age_range_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'child_age_range_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Child Tax Calculation Type'),
+ 'name' => 'child_calc_type',
+ 'form_group_class' => 'tourism-tax-field tourism-tax-child-band-field',
+ 'hint' => $this->l('Fixed: each age range charges its own flat amount. Percentage: each age range charges a percentage of the adult\'s own calculated tax.'),
+ 'options' => array(
+ 'query' => array(
+ array('id' => 0, 'name' => $this->l('Fixed')),
+ array('id' => 1, 'name' => $this->l('Percentage')),
+ ),
+ 'id' => 'id',
+ 'name' => 'name',
+ ),
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Child age ranges'),
+ 'name' => 'child_ranges',
+ 'html_content' => $ageBandsHtml,
+ 'form_group_class' => 'tourism-tax-field tourism-tax-child-band-field',
+ 'desc' => sprintf(
+ $this->l('Leave blank for no limit; ages must be ≥ %d and < %d. Children outside all ranges are charged the adult’s calculated tax.'),
+ $infantMaxAge,
+ $childMaxAge
+ ),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Tiered pricing'),
+ 'name' => 'is_tiered',
+ 'is_bool' => true,
+ 'desc' => $this->l('When enabled, the tax amount is determined by the matching price range below. Prices outside all ranges use the base Tax value above.'),
+ 'form_group_class' => 'tourism-tax-field',
+ 'values' => array(
+ array('id' => 'tiered_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'tiered_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Price ranges'),
+ 'name' => 'tiers',
+ 'html_content' => $priceBracketsHtml,
+ 'form_group_class' => 'tourism-tax-field tourism-tax-tiered-field',
+ 'desc' => $this->l('Leave blank for no limit; the maximum price is exclusive. Prices outside all ranges are charged the adult’s calculated tax.'),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Set valid date ranges'),
+ 'name' => 'has_multiple_valid_ranges',
+ 'is_bool' => true,
+ 'desc' => $this->l('When enabled, define one or more validity date ranges below — the tax only applies within them. When disabled, there is no date restriction at all.'),
+ 'form_group_class' => 'tourism-tax-field',
+ 'values' => array(
+ array('id' => 'multi_valid_on', 'value' => 1, 'label' => $this->l('Yes')),
+ array('id' => 'multi_valid_off', 'value' => 0, 'label' => $this->l('No')),
+ ),
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Valid ranges'),
+ 'name' => 'validity_ranges',
+ 'html_content' => $validityRangesHtml,
+ 'form_group_class' => 'tourism-tax-field tourism-tax-multi-valid-field',
+ 'desc' => $this->l('Leave "From" blank for no start date and "To" for no end date. Ranges cannot overlap.'),
+ ),
+ array(
+ 'type' => 'html',
+ 'label' => $this->l('Valid days'),
+ 'name' => 'valid_days_wrap',
+ 'html_content' => $weekdayCheckboxesHtml
+ . '' + . $this->l('Uncheck days when the tax should not apply within the date range.') + . '
', + 'form_group_class' => 'tourism-tax-field', + ), ), + 'submit' => array('title' => $this->l('Save')), 'buttons' => array( 'save-and-stay' => array( 'title' => $this->l('Save and stay'), - 'name' => 'submitAdd'.$this->table.'AndStay', + 'name' => 'submitAdd' . $this->table . 'AndStay', 'type' => 'submit', 'class' => 'btn btn-default pull-right', 'icon' => 'process-icon-save', @@ -248,25 +816,72 @@ class AdminTaxesControllerCore extends AdminController return parent::renderForm(); } + /** + * List column callback: display a Yes/No badge for is_tourism_tax. + * + * @param mixed $value 1 or 0 + * @param array $row + * @return string + */ + public function displayTourismTaxBadge($value, $row) + { + if ($value) { + return '' . $this->l('Yes') . ''; + } + return '' . $this->l('No') . ''; + } + + /** + * List column callback: display tax rate with the correct symbol. + * Tourism-fixed taxes show currency sign; tourism-percent and regular taxes show %. + * + * @param mixed $value ps_tax.rate + * @param array $row Full list row (includes tourism_tax_calc_type, tourism_tax_value from join) + * @return string + */ + public function displayRate($value, $row) + { + return TaxConfiguration::getFormattedRateForDisplay($value, $row, $this->context->currency); + } + public function postProcess() { if ($this->action == 'save') { + if ((int) Tools::getValue('is_tourism_tax')) { + $_POST['rate'] = '0'; + } /* Checking fields validity */ $this->validateRules(); + $this->validateTourismTaxFields(); if (!count($this->errors)) { - $id = (int)(Tools::getValue('id_'.$this->table)); + $existingTaxId = (int)(Tools::getValue('id_'.$this->table)); + $isTourismTax = (int) Tools::getValue('is_tourism_tax'); /* Object update */ - if (isset($id) && !empty($id)) { + if (isset($existingTaxId) && !empty($existingTaxId)) { /** @var Tax $object */ - $object = new $this->className($id); + $object = new $this->className($existingTaxId); if (Validate::isLoadedObject($object)) { + $wasTourismTax = (int) $object->is_tourism_tax; $this->copyFromPost($object, $this->table); $result = $object->update(false, false); if (!$result) { $this->errors[] = Tools::displayError('An error occurred while updating an object.').' '.$this->table.''; } elseif ($this->postImage($object->id)) { + if ($isTourismTax) { + self::saveTourismTaxSubtype($object->id); + } + if ($wasTourismTax && !$isTourismTax) { + $this->cleanTaxFromTourismTaxRulesGroups($object->id); + $tourismTax = TaxConfiguration::getByTaxId($object->id); + if ($tourismTax) { + $tourismTax->delete(); + } + } + if (!$wasTourismTax && $isTourismTax) { + $this->cleanTaxFromVatTaxRulesGroups($object->id); + } if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) { Tools::redirectAdmin(self::$currentIndex.'&update'.$this->table.'&id_'.$this->table.'='.$object->id.'&conf=4'.'&token='.$this->token); } else { @@ -286,12 +901,14 @@ class AdminTaxesControllerCore extends AdminController if (!$object->add()) { $this->errors[] = Tools::displayError('An error occurred while creating an object.').' '.$this->table.''; } elseif ($this->postImage($object->id)) { + if ($isTourismTax) { + self::saveTourismTaxSubtype($object->id); + } if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) { Tools::redirectAdmin(self::$currentIndex.'&update'.$this->table.'&id_'.$this->table.'='.$object->id.'&conf=3'.'&token='.$this->token); } else { Tools::redirectAdmin(self::$currentIndex.'&conf=3&token='.$this->token); } - Tools::redirectAdmin(self::$currentIndex.'&id_'.$this->table.'='.$object->id.'&conf=3'.'&token='.$this->token); } } } else { @@ -302,6 +919,317 @@ class AdminTaxesControllerCore extends AdminController } } + /** + * Validate tourism-tax-specific fields and append to $this->errors. + */ + protected function validateTourismTaxFields() + { + if (!(int) Tools::getValue('is_tourism_tax')) { + return; + } + + $taxValue = Tools::getValue('tax_value', ''); + if ($taxValue === '') { + $this->errors[] = $this->l('Tax value is required.'); + $this->invalidCoreFields['tax_value'] = true; + } else { + if (!is_numeric($taxValue)) { + $this->errors[] = $this->l('Tax value must be a valid number.'); + $this->invalidCoreFields['tax_value'] = true; + } elseif ((float) $taxValue < 0) { + $this->errors[] = $this->l('Tax value cannot be negative.'); + $this->invalidCoreFields['tax_value'] = true; + } + } + + if ((int) Tools::getValue('has_multiple_valid_ranges')) { + $submittedRangeFroms = Tools::getValue('validity_from', array()); + $submittedRangeTos = Tools::getValue('validity_to', array()); + $filledRanges = array(); + foreach ($submittedRangeFroms as $rowIndex => $fromRaw) { + $toRaw = isset($submittedRangeTos[$rowIndex]) ? $submittedRangeTos[$rowIndex] : ''; + $fromRaw = trim($fromRaw); + $toRaw = trim($toRaw); + if ($fromRaw === '0000-00-00') { $fromRaw = ''; } + if ($toRaw === '0000-00-00') { $toRaw = ''; } + $rowNum = (int) $rowIndex + 1; + if ($fromRaw === '' && $toRaw === '') { + continue; + } + if ($fromRaw !== '' && !Validate::isDate($fromRaw)) { + $this->errors[] = sprintf($this->l('Valid range #%d: "From" is not a valid date.'), $rowNum); + $this->invalidValidityFields[$rowIndex]['from'] = true; + } + if ($toRaw !== '' && !Validate::isDate($toRaw)) { + $this->errors[] = sprintf($this->l('Valid range #%d: "To" is not a valid date.'), $rowNum); + $this->invalidValidityFields[$rowIndex]['to'] = true; + } + if ($fromRaw !== '' && $toRaw !== '' && Validate::isDate($fromRaw) && Validate::isDate($toRaw) + && strtotime($toRaw) < strtotime($fromRaw) + ) { + $this->errors[] = sprintf($this->l('Valid range #%d: "To" must be on or after "From".'), $rowNum); + $this->invalidValidityFields[$rowIndex]['from'] = true; + $this->invalidValidityFields[$rowIndex]['to'] = true; + } + $filledRanges[] = array( + 'from' => ($fromRaw !== '' && Validate::isDate($fromRaw)) ? strtotime($fromRaw) : null, + 'to' => ($toRaw !== '' && Validate::isDate($toRaw)) ? strtotime($toRaw) : null, + 'rowNum' => $rowNum, + 'rowIndex' => $rowIndex, + ); + } + if (empty($filledRanges)) { + $this->errors[] = $this->l('Add at least one range or disable "Set valid date ranges".'); + } + $rangeCount = count($filledRanges); + for ($outerIdx = 0; $outerIdx < $rangeCount; $outerIdx++) { + for ($innerIdx = $outerIdx + 1; $innerIdx < $rangeCount; $innerIdx++) { + $outerRange = $filledRanges[$outerIdx]; + $innerRange = $filledRanges[$innerIdx]; + $outerMinEffective = ($outerRange['from'] === null) ? -PHP_INT_MAX : $outerRange['from']; + $outerMaxEffective = ($outerRange['to'] === null) ? PHP_INT_MAX : $outerRange['to']; + $innerMinEffective = ($innerRange['from'] === null) ? -PHP_INT_MAX : $innerRange['from']; + $innerMaxEffective = ($innerRange['to'] === null) ? PHP_INT_MAX : $innerRange['to']; + if ($outerMinEffective <= $innerMaxEffective && $outerMaxEffective >= $innerMinEffective) { + $this->errors[] = sprintf( + $this->l('Valid ranges #%d and #%d overlap. Each range must cover a distinct period.'), + $outerRange['rowNum'], + $innerRange['rowNum'] + ); + $this->invalidValidityFields[$outerRange['rowIndex']]['from'] = true; + $this->invalidValidityFields[$outerRange['rowIndex']]['to'] = true; + $this->invalidValidityFields[$innerRange['rowIndex']]['from'] = true; + $this->invalidValidityFields[$innerRange['rowIndex']]['to'] = true; + break 2; + } + } + } + } + + if ((int) Tools::getValue('has_child_rate') && (int) Tools::getValue('has_child_age_range')) { + $infantMaxAge = (int) Configuration::get('QLO_GLOBAL_MAX_INFANT_AGE'); + $childMaxAge = (int) Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'); + $submittedBandMins = Tools::getValue('child_min', array()); + $submittedBandMaxs = Tools::getValue('child_max', array()); + $submittedBandValues = Tools::getValue('child_value', array()); + if (empty($submittedBandValues)) { + $this->errors[] = $this->l('Add at least one range or disable "Set child age range".'); + } + $filledBands = array(); + foreach ($submittedBandValues as $rowIndex => $taxValue) { + $bandMinRaw = isset($submittedBandMins[$rowIndex]) ? $submittedBandMins[$rowIndex] : ''; + $bandMaxRaw = isset($submittedBandMaxs[$rowIndex]) ? $submittedBandMaxs[$rowIndex] : ''; + $rowNum = (int) $rowIndex + 1; + if ($taxValue === '' || $taxValue === false) { + $this->errors[] = sprintf($this->l('Child range #%d: tax value is required.'), $rowNum); + $this->invalidChildFields[$rowIndex]['value'] = true; + continue; + } + $bandMin = ($bandMinRaw !== '') ? (int) $bandMinRaw : 0; + $bandMax = ($bandMaxRaw !== '') ? (int) $bandMaxRaw : 0; + if (!is_numeric($taxValue)) { + $this->errors[] = sprintf($this->l('Child range #%d: tax value must be a valid number.'), $rowNum); + $this->invalidChildFields[$rowIndex]['value'] = true; + } elseif ((float) $taxValue < 0) { + $this->errors[] = sprintf($this->l('Child range #%d: tax value cannot be negative.'), $rowNum); + $this->invalidChildFields[$rowIndex]['value'] = true; + } + if ($bandMax > 0 && $bandMin > $bandMax) { + $this->errors[] = sprintf($this->l('Child range #%d: min age cannot be greater than max age.'), $rowNum); + $this->invalidChildFields[$rowIndex]['min'] = true; + $this->invalidChildFields[$rowIndex]['max'] = true; + } + if ($bandMin > 0 && $bandMin < $infantMaxAge) { + $this->errors[] = sprintf($this->l('Child range #%d: min age cannot be below the infant age (%d).'), $rowNum, $infantMaxAge); + $this->invalidChildFields[$rowIndex]['min'] = true; + } + if ($bandMax > 0 && $bandMax >= $childMaxAge) { + $this->errors[] = sprintf($this->l('Child range #%d: max age cannot be %d or above (the general child age setting).'), $rowNum, $childMaxAge); + $this->invalidChildFields[$rowIndex]['max'] = true; + } + $filledBands[] = array('minAge' => $bandMin, 'maxAge' => $bandMax, 'rowNum' => $rowNum, 'rowIndex' => $rowIndex); + } + $bandCount = count($filledBands); + for ($outerIdx = 0; $outerIdx < $bandCount; $outerIdx++) { + for ($innerIdx = $outerIdx + 1; $innerIdx < $bandCount; $innerIdx++) { + $outerBand = $filledBands[$outerIdx]; + $innerBand = $filledBands[$innerIdx]; + $outerMaxEffective = ($outerBand['maxAge'] == 0) ? PHP_INT_MAX : $outerBand['maxAge']; + $innerMaxEffective = ($innerBand['maxAge'] == 0) ? PHP_INT_MAX : $innerBand['maxAge']; + if ($outerBand['minAge'] <= $innerMaxEffective && $outerMaxEffective >= $innerBand['minAge']) { + $this->errors[] = sprintf( + $this->l('Child age ranges #%d and #%d overlap. Each range must cover a distinct age range.'), + $outerBand['rowNum'], + $innerBand['rowNum'] + ); + $this->invalidChildFields[$outerBand['rowIndex']]['min'] = true; + $this->invalidChildFields[$outerBand['rowIndex']]['max'] = true; + $this->invalidChildFields[$innerBand['rowIndex']]['min'] = true; + $this->invalidChildFields[$innerBand['rowIndex']]['max'] = true; + break 2; + } + } + } + } + + if ((int) Tools::getValue('is_tiered')) { + $submittedTierMins = Tools::getValue('tier_min', array()); + $submittedTierMaxs = Tools::getValue('tier_max', array()); + $submittedTierValues = Tools::getValue('tier_value', array()); + if (empty($submittedTierValues)) { + $this->errors[] = $this->l('Add at least one range or disable "Tiered pricing".'); + } + $filledTiers = array(); + foreach ($submittedTierValues as $rowIndex => $taxValue) { + $tierMinRaw = isset($submittedTierMins[$rowIndex]) ? $submittedTierMins[$rowIndex] : ''; + $tierMaxRaw = isset($submittedTierMaxs[$rowIndex]) ? $submittedTierMaxs[$rowIndex] : ''; + $rowNum = (int) $rowIndex + 1; + if ($taxValue === '' || $taxValue === false) { + $this->errors[] = sprintf($this->l('Tier #%d: tax value is required.'), $rowNum); + $this->invalidTierFields[$rowIndex]['value'] = true; + continue; + } + $tierMin = ($tierMinRaw !== '') ? (float) $tierMinRaw : 0.0; + $tierMax = ($tierMaxRaw !== '') ? (float) $tierMaxRaw : 0.0; + if (!is_numeric($taxValue)) { + $this->errors[] = sprintf($this->l('Tier #%d: tax value must be a valid number.'), $rowNum); + $this->invalidTierFields[$rowIndex]['value'] = true; + } elseif ((float) $taxValue < 0) { + $this->errors[] = sprintf($this->l('Tier #%d: tax value cannot be negative.'), $rowNum); + $this->invalidTierFields[$rowIndex]['value'] = true; + } + if ($tierMax > 0 && $tierMin > $tierMax) { + $this->errors[] = sprintf($this->l('Tier #%d: min price cannot be greater than max price.'), $rowNum); + $this->invalidTierFields[$rowIndex]['min'] = true; + $this->invalidTierFields[$rowIndex]['max'] = true; + } + $filledTiers[] = array('minPrice' => $tierMin, 'maxPrice' => $tierMax, 'rowNum' => $rowNum, 'rowIndex' => $rowIndex); + } + $tierCount = count($filledTiers); + for ($outerIdx = 0; $outerIdx < $tierCount; $outerIdx++) { + for ($innerIdx = $outerIdx + 1; $innerIdx < $tierCount; $innerIdx++) { + $outerTier = $filledTiers[$outerIdx]; + $innerTier = $filledTiers[$innerIdx]; + $outerMaxEffective = ($outerTier['maxPrice'] == 0) ? PHP_FLOAT_MAX : $outerTier['maxPrice']; + $innerMaxEffective = ($innerTier['maxPrice'] == 0) ? PHP_FLOAT_MAX : $innerTier['maxPrice']; + if ($outerTier['minPrice'] < $innerMaxEffective && $outerMaxEffective > $innerTier['minPrice']) { + $this->errors[] = sprintf( + $this->l('Price ranges #%d and #%d overlap. Each range must cover a distinct price range.'), + $outerTier['rowNum'], + $innerTier['rowNum'] + ); + $this->invalidTierFields[$outerTier['rowIndex']]['min'] = true; + $this->invalidTierFields[$outerTier['rowIndex']]['max'] = true; + $this->invalidTierFields[$innerTier['rowIndex']]['min'] = true; + $this->invalidTierFields[$innerTier['rowIndex']]['max'] = true; + break 2; + } + } + } + } + } + + public function setMedia() + { + parent::setMedia(); + if ($this->display == 'edit' || $this->display == 'add') { + $this->addCSS(_MODULE_DIR_ . 'hotelreservationsystem/views/css/HotelReservationAdmin.css'); + $this->addJs(_MODULE_DIR_ . 'hotelreservationsystem/views/js/TourismTaxForm.js'); + } + } + + /** + * @param int $idTax + */ + protected static function saveTourismTaxSubtype($idTax) + { + $idTax = (int) $idTax; + $tourismTax = TaxConfiguration::getByTaxId($idTax); + $tourismTaxExists = (bool) $tourismTax; + if (!$tourismTax) { + $tourismTax = new TaxConfiguration(); + $tourismTax->id = $idTax; + } + $tourismTax->calculation_type = (int) Tools::getValue('tax_calc_type', 0); + $tourismTax->per_night = (int) Tools::getValue('is_per_night', 1); + $tourismTax->per_person = (int) Tools::getValue('is_per_person', 0); + $tourismTax->tax_value = (float) Tools::getValue('tax_value', 0); + $tourismTax->has_tiered_pricing = (int) Tools::getValue('is_tiered', 0); + $tourismTax->apply_on_child = (int) Tools::getValue('has_child_rate', 0); + $tourismTax->has_child_age_range = (int) Tools::getValue('has_child_age_range', 0); + $tourismTax->child_calculation_type = (int) Tools::getValue('child_calc_type', 0); + $tourismTax->has_multiple_valid_ranges = (int) Tools::getValue('has_multiple_valid_ranges', 0); + + $submittedDays = Tools::getValue('valid_days', array()); + if (!is_array($submittedDays)) { + $submittedDays = array(); + } + $submittedDays = array_values(array_intersect(TaxConfiguration::DAY_KEYS, $submittedDays)); + if (empty($submittedDays) || count($submittedDays) === 7) { + $tourismTax->special_days = null; + } else { + $tourismTax->special_days = json_encode($submittedDays); + } + + if ($tourismTaxExists) { + $tourismTax->update(); + } else { + $tourismTax->add(); + } + + TaxPriceTier::saveAll( + $idTax, + Tools::getValue('tier_min', array()), + Tools::getValue('tier_max', array()), + Tools::getValue('tier_value', array()) + ); + TaxChildRange::saveAll( + $idTax, + Tools::getValue('child_min', array()), + Tools::getValue('child_max', array()), + Tools::getValue('child_value', array()) + ); + TaxValidityRange::saveAll( + $idTax, + Tools::getValue('validity_from', array()), + Tools::getValue('validity_to', array()) + ); + } + + /** + * Remove this tax from all tourism tax rules groups when it is demoted from tourism to regular. + * Flashes a warning listing how many rule rows were deleted. + * + * @param int $idTax + */ + protected function cleanTaxFromTourismTaxRulesGroups($idTax) + { + $count = TaxConfiguration::cleanFromTourismTaxRulesGroups($idTax); + if ($count) { + $this->warnings[] = sprintf( + $this->l('This tax was removed from %d tourism tax rules group(s) because it is no longer marked as a tourism tax.'), + $count + ); + } + } + + /** + * Remove this tax from all standard (non-tourism) tax rules groups when it is promoted to a + * tourism tax. Flashes a warning listing how many rule rows were deleted. + * + * @param int $idTax + */ + protected function cleanTaxFromVatTaxRulesGroups($idTax) + { + $count = TaxConfiguration::cleanFromVatTaxRulesGroups($idTax); + if ($count) { + $this->warnings[] = sprintf( + $this->l('This tax was removed from %d standard tax rules group(s) because it is now marked as a tourism tax.'), + $count + ); + } + } + public function updateOptionPsUseEcotax($value) { $old_value = (int)Configuration::get('PS_USE_ECOTAX'); diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index e56831c50..b5c79be40 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -110,6 +110,23 @@ class AdminTranslationsControllerCore extends AdminController 'page_header_toolbar_title' => $this->page_header_toolbar_title, 'page_header_toolbar_btn' => $this->page_header_toolbar_btn)); } + public function setMedia() + { + parent::setMedia(); + + if (Tools::getValue('type') == 'mails') { + Media::addJsDef(array( + 'mailResetSuccessMsg' => $this->l('The template is reset to its original content.'), + 'mailResetErrorMsg' => $this->l('An error occurred while resetting the template.'), + 'mailResetTooltipCore' => $this->l('On reset, the template will be reset to the default mail template.'), + 'mailResetTooltipModule' => $this->l('On reset, the template will be reset using modules/{module}/mails/{iso}/'), + 'admin_translations_link' => $this->context->link->getAdminLink('AdminTranslations'), + 'EMAIL_TEMPLATE_TYPE_CORE' => Language::EMAIL_TEMPLATE_TYPE_CORE, + 'EMAIL_TEMPLATE_TYPE_MODULE' => Language::EMAIL_TEMPLATE_TYPE_MODULE, + )); + $this->addJS(_PS_JS_DIR_.'admin/translations.js'); + } + } /** * This function create vars by default and call the good method for generate form @@ -1429,6 +1446,9 @@ class AdminTranslationsControllerCore extends AdminController */ public function postProcess() { + if ($this->ajax) { + return parent::postProcess(); + } $this->getInformations(); /* PrestaShop demo mode */ @@ -1663,6 +1683,50 @@ class AdminTranslationsControllerCore extends AdminController } } + public function ajaxProcessResetMailTemplate() + { + if (empty($this->tabAccess['edit'])) { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('You do not have permission to edit this.')))); + } + + $iso_code = Tools::getValue('iso_code') ? Tools::getValue('iso_code') : null; + $theme = Tools::getValue('theme'); + $mail_template_name = Tools::getValue('mail_name'); + $template_type = (int)Tools::getValue('template_type'); + $module_name = Tools::getValue('module_name') ? Tools::getValue('module_name') : false; + + if (!Validate::isLanguageIsoCode($iso_code)) { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('Invalid iso code.')))); + } + + if (!Validate::isTplName($mail_template_name)) { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('Invalid mail template to reset.')))); + } + + if ($template_type === Language::EMAIL_TEMPLATE_TYPE_MODULE) { + if (!$module_name || !Validate::isModuleName($module_name)) { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('Invalid module name.')))); + } + } elseif ($template_type === Language::EMAIL_TEMPLATE_TYPE_CORE) { + $module_name = false; + } else { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('Invalid template type.')))); + } + + if ($theme) { + $themes_base_dir = realpath(_PS_ALL_THEMES_DIR_); + $theme_real_path = realpath(_PS_ALL_THEMES_DIR_.$theme); + if ($themes_base_dir === false + || $theme_real_path === false + || strncmp($theme_real_path, $themes_base_dir.DIRECTORY_SEPARATOR, strlen($themes_base_dir) + 1) !== 0 + ) { + die(json_encode(array('hasError' => true, 'error' => Tools::displayError('Invalid theme.')))); + } + } + + die(json_encode(Language::resetEmailTemplate($mail_template_name, $iso_code, $template_type, $module_name, $theme))); + } + /** * Include file $dir/$file and return the var $var declared in it. * This create the file if not exists @@ -2362,9 +2426,12 @@ class AdminTranslationsControllerCore extends AdminController $str_return .= '';
$str_return .= $this->displayMailBlockTxt($mail_files['txt'], $obj_lang->iso_code, $mail_name, $group_name, $name_for_module);
+ $str_return .= $mail_available_variables;
$str_return .= '
';
}
@@ -2372,6 +2439,7 @@ class AdminTranslationsControllerCore extends AdminController
if (isset($mail_files['html'])) {
$str_return .= $this->displayMailEditor($mail_files['html'], $obj_lang->iso_code, $url_mail, $mail_name, $group_name, $name_for_module);
}
+ $str_return .= $mail_available_variables;
$str_return .= '';
+ foreach ($variables as $variable) {
+ $tag = '{'.$variable.'}';
+ $str_return .= ''.Tools::htmlentitiesUTF8($tag).' ';
+ }
+ $str_return .= '
';
+
+ return $str_return;
+ }
+ protected function getMailTemplateVariables($mail_files)
+ {
+ $content = '';
+ foreach (array('html', 'txt') as $type) {
+ if (empty($mail_files[$type]) || !is_array($mail_files[$type])) {
+ continue;
+ }
+ if (isset($mail_files[$type]['en'])) {
+ $content .= ' '.$mail_files[$type]['en'];
+ } else {
+ $content .= ' '.reset($mail_files[$type]);
+ }
+ }
+
+ $variables = array();
+ if ($content !== '' && preg_match_all('/\{([a-zA-Z0-9_]+)\}/', $content, $matches)) {
+ $variables = array_unique($matches[1]);
+ sort($variables);
+ }
+
+ return $variables;
+ }
+
/**
* Just build the html structure for display txt mails
* @since 1.4.0.14
@@ -3070,12 +3178,31 @@ class AdminTranslationsControllerCore extends AdminController
}
$sanitizedFilePath = realpath($email_file);
- $permittedMailDir = realpath(_PS_MAIL_DIR_) . DIRECTORY_SEPARATOR;
+ if ($sanitizedFilePath === false) {
+ return false;
+ }
- if ($sanitizedFilePath === false || $permittedMailDir === false || strpos($sanitizedFilePath, $permittedMailDir) !== 0) {
+ $permitted_roots = array(
+ realpath(_PS_MAIL_DIR_),
+ realpath(_PS_ROOT_DIR_.'/themes/'),
+ realpath(_PS_ROOT_DIR_.'/modules/'),
+ );
+
+ $is_permitted = false;
+ foreach ($permitted_roots as $permitted_root) {
+ if ($permitted_root !== false
+ && strpos($sanitizedFilePath, $permitted_root.DIRECTORY_SEPARATOR) === 0
+ && strpos($sanitizedFilePath, DIRECTORY_SEPARATOR.'mails'.DIRECTORY_SEPARATOR) !== false
+ ) {
+ $is_permitted = true;
+ break;
+ }
+ }
+
+ if (!$is_permitted) {
return false;
}
return file_get_contents($sanitizedFilePath);
}
-}
+}
\ No newline at end of file
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 91b583007..41258d478 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -106,6 +106,9 @@ class AuthControllerCore extends FrontController
$newsletter = Configuration::get('PS_CUSTOMER_NWSL') || (Module::isInstalled('blocknewsletter') && Module::getInstanceByName('blocknewsletter')->active);
$this->context->smarty->assign('birthday', (bool) Configuration::get('PS_CUSTOMER_BIRTHDATE'));
+ $this->context->smarty->assign('nationality', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY'));
+ $this->context->smarty->assign('nationality_mandatory', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY'));
+ $this->context->smarty->assign('nationality_countries', Customer::getNationalities($this->context->language->id));
$this->context->smarty->assign('newsletter', $newsletter);
$this->context->smarty->assign('optin', (bool)Configuration::get('PS_CUSTOMER_OPTIN'));
@@ -429,6 +432,10 @@ class AuthControllerCore extends FrontController
$this->errors[] = Tools::displayError('Phone number is required.');
}
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY') && !Tools::getValue('id_nationality')) {
+ $this->errors[] = Tools::displayError('Nationality is required.');
+ }
+
if (!Tools::getValue('is_new_customer', 1)) {
if (Validate::isEmail($email = Tools::getValue('email'))
&& $idCustomer = Customer::customerExists(Tools::getValue('email'), true, false)
@@ -461,6 +468,7 @@ class AuthControllerCore extends FrontController
if (!count($this->errors)) {
$customer->phone = Tools::getValue('phone');
+ $customer->id_country = (int)Tools::getValue('id_nationality');
if ($customer->add()) {
if (!$customer->is_guest) {
if (!$this->sendConfirmationMail($customer)) {
@@ -607,6 +615,7 @@ class AuthControllerCore extends FrontController
$customer->is_guest = 0;
}
$customer->phone = Tools::getValue('phone');
+ $customer->id_country = (int)Tools::getValue('id_nationality');
if (!$customer->save()) {
$this->errors[] = Tools::displayError('An error occurred while creating your account.');
} else {
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 76f2e5982..deb20807d 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -155,8 +155,8 @@ class CartControllerCore extends FrontController
$result = $this->context->cart->deleteProduct($this->id_product, $this->id_product_attribute, $this->customization_id, $this->id_address_delivery);
// now get updated available rooms
- $date_from = Tools::getValue('dateFrom');
- $date_to = Tools::getValue('dateTo');
+ $date_from = Tools::getValue('date_from');
+ $date_to = Tools::getValue('date_to');
$date_from = date("Y-m-d H:i:s", strtotime($date_from));
$date_to = date("Y-m-d H:i:s", strtotime($date_to));
$objRoomType = new HotelRoomType();
@@ -315,7 +315,7 @@ class CartControllerCore extends FrontController
}
if ($occupancyRequiredForBooking && $operator == 'up') {
- if ($occupancy = json_decode(Tools::getValue('occupancy'), true)) {
+ if ($occupancy = Tools::getValue('occupancy')) {
$this->qty = count($occupancy);
} else {
$this->errors[] = Tools::displayError('Invalid occupnacy.');
@@ -337,11 +337,21 @@ class CartControllerCore extends FrontController
if (!$this->errors) {
$objRoomType = new HotelRoomType();
if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) {
- $date_from = Tools::getValue('dateFrom');
- $date_to = Tools::getValue('dateTo');
+ $date_from = Tools::getValue('date_from');
+ $date_to = Tools::getValue('date_to');
$date_from = date("Y-m-d H:i:s", strtotime($date_from));
$date_to = date("Y-m-d H:i:s", strtotime($date_to));
- $serviceProducts = json_decode(Tools::getValue('serviceProducts'),true);
+
+ $rawServiceProducts = Tools::getValue('service_product');
+ $serviceProducts = [];
+ if (is_array($rawServiceProducts) && !empty($rawServiceProducts)) {
+ foreach ($rawServiceProducts as $id_product => $data) {
+ $serviceProducts[] = [
+ 'id_product' => (int) $id_product,
+ 'quantity' => isset($data['quantity']) ? (int) $data['quantity'] : 1,
+ ];
+ }
+ }
// valdiate occupancy if providede
if ($operator == 'up' && $occupancyRequiredForBooking) {
@@ -419,7 +429,11 @@ class CartControllerCore extends FrontController
$total_available_rooms = $hotelRoomData['stats']['num_avail'];
if (Tools::getValue('op', 'up') == 'up') {
if ($total_available_rooms < $req_rm) {
- die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms)));
+ if (Tools::getValue('ajax')) {
+ die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms)));
+ } else {
+ $this->errors[] = Tools::displayError('All rooms are sold out for the selected dates. Please try with different dates.');
+ }
} else {
// validate service products if available
if ($serviceProducts) {
@@ -450,10 +464,18 @@ class CartControllerCore extends FrontController
}
}
} else {
- die(json_encode(array('status' => 'failed3')));
+ if (Tools::getValue('ajax')) {
+ die(json_encode(array('status' => 'failed3')));
+ } else {
+ $this->errors[] = Tools::displayError('An error occurred while processing your request.');
+ }
}
} else {
- die(json_encode(array('status' => 'failed4')));
+ if (Tools::getValue('ajax')) {
+ die(json_encode(array('status' => 'failed4')));
+ } else {
+ $this->errors[] = Tools::displayError('An error occurred while processing your request.');
+ }
}
}
} else {
@@ -607,8 +629,6 @@ class CartControllerCore extends FrontController
*/
if ($product->booking_product) {
$objHotelCartBookingData = new HotelCartBookingData();
- $roomDemand = json_decode(Tools::getValue('roomDemands'), true);
- $roomDemand = json_encode($roomDemand);
$availQty = $total_available_rooms;
$update_quantity = $objHotelCartBookingData->updateCartBooking(
$this->id_product,
@@ -618,7 +638,6 @@ class CartControllerCore extends FrontController
0,
$date_from,
$date_to,
- $roomDemand,
$serviceProducts,
$id_cart,
$id_guest
@@ -630,7 +649,6 @@ class CartControllerCore extends FrontController
'date_to' => $date_to,
'id_product' => $this->id_product,
'occupancy' => $occupancy,
- 'room_demand' => $roomDemand,
'req_rm' => $req_rm
));
} else {
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index 6abb5d336..7be5770b7 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -59,6 +59,7 @@ class CategoryControllerCore extends FrontController
$this->addCSS(_THEME_CSS_DIR_.'occupancy.css');
$this->addJS(_THEME_JS_DIR_.'occupancy.js');
+ $this->addJS(_THEME_JS_DIR_.'room-type-service-products.js');
$scenes = Scene::getScenes($this->category->id, $this->context->language->id, true, false);
if ($scenes && count($scenes)) {
$this->addJS(_THEME_JS_DIR_.'scenes.js');
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index acb21798d..4faa76dea 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -311,7 +311,7 @@ class ContactControllerCore extends FrontController
)
) {
// by webkul to get media link.
- $htlImgLink = $this->context->link->getMediaLink($objHotelImage->getImageLink($hotel['id_cover_img'], ImageType::getFormatedName('medium')));
+ $htlImgLink = $this->context->link->getMediaLink($objHotelImage->getImageLink($hotel['id_cover_img'], ImageType::getFormatedName('large')));
if ((bool)Tools::file_get_contents($htlImgLink)) {
$hotel['image_url'] = $htlImgLink;
@@ -330,7 +330,6 @@ class ContactControllerCore extends FrontController
$this->context->smarty->assign(
array(
'hotelsInfo' => $hotelsInfo,
- 'viewOnMap' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'),
'displayHotels' => Configuration::get('WK_DISPLAY_CONTACT_PAGE_HOTEL_LIST'),
'gblHtlPhone' => $gblHtlPhone,
'gblHtlEmail' => $gblHtlEmail,
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index c685eb430..32b5cdce4 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -106,35 +106,25 @@ class GuestTrackingControllerCore extends FrontController
}
}
- public function displayAjaxGetRoomTypeBookingDemands()
+ public function displayAjaxgetRoomTypeBookingServices()
{
- $response = array('extra_demands' => false);
+ $response = array('extra_services' => false);
+
+ $order = new Order((int) Tools::getValue('id_order'));
+
+ if (!Validate::isLoadedObject($order) || $order->secure_key != Tools::getValue('secure_key')) {
+ $this->ajaxDie(json_encode($response));
+ }
if (($idProduct = Tools::getValue('id_product'))
&& ($idOrder = Tools::getValue('id_order'))
&& ($dateFrom = Tools::getValue('date_from'))
&& ($dateTo = Tools::getValue('date_to'))
) {
- $objHotelBookingDemands = new HotelBookingDemands();
$useTax = 0;
if (Group::getPriceDisplayMethod($this->context->customer->id_default_group) == PS_TAX_INC) {
$useTax = 1;
}
- if ($extraDemands = $objHotelBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(array(
- 'useTax' => $useTax,
- 'extraDemands' => $extraDemands,
- ));
- }
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
@@ -158,7 +148,7 @@ class GuestTrackingControllerCore extends FrontController
'objOrder' => new Order($idOrder),
));
- $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
+ $response['extra_services'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
}
$this->ajaxDie(json_encode($response));
@@ -257,10 +247,9 @@ class GuestTrackingControllerCore extends FrontController
$hotelServiceProducts = array();
if ($hotelresInstalled) {
if ($orderProducts = $order->getProducts()) {
- $total_demands_price_te = 0;
- $total_demands_price_ti = 0;
$total_convenience_fee_te = 0;
$total_convenience_fee_ti = 0;
+ $total_tourism_tax = OrderTaxDetail::getOrderTourismTaxTotal($idOrder);
$objOrderReturn = new OrderReturn();
$refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1);
@@ -291,8 +280,6 @@ class GuestTrackingControllerCore extends FrontController
$cartHotelData[$type_key]['id_product'] = $type_value['product_id'];
$cartHotelData[$type_key]['cover_img'] = $cover_img;
-
- $objBookingDemand = new HotelBookingDemands();
foreach ($order_bk_data as $data_k => $data_v) {
$date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']);
@@ -366,41 +353,6 @@ class GuestTrackingControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id'];
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to']
- );
- if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) {
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0;
- }
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1
- );
- if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) {
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0;
- }
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0
- );
- $total_demands_price_ti += $extraDemandPriceTI;
- $total_demands_price_te += $extraDemandPriceTE;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl;
@@ -410,7 +362,7 @@ class GuestTrackingControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff;
$cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name'];
- // add additional services products in hotel detail.
+ // add extra services products in hotel detail.
$cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
0,
@@ -575,8 +527,6 @@ class GuestTrackingControllerCore extends FrontController
// set order specific values
$order->total_convenience_fee_ti = $total_convenience_fee_ti;
$order->total_convenience_fee_te = $total_convenience_fee_te;
- $order->total_demands_price_ti = $total_demands_price_ti;
- $order->total_demands_price_te = $total_demands_price_te;
$order->any_back_order = $anyBackOrder;
$order->shw_bo_msg = Configuration::get('WK_SHOW_MSG_ON_BO');
$order->back_ord_msg = Configuration::get('WK_BO_MESSAGE');
@@ -606,6 +556,7 @@ class GuestTrackingControllerCore extends FrontController
'use_tax' => Configuration::get('PS_TAX'),
'guestInformations' => (array)$customer,
'view_on_map' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'),
+ 'total_tourism_tax' => isset($total_tourism_tax) ? $total_tourism_tax : 0,
));
}
diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php
index b24881336..0e29de05a 100644
--- a/controllers/front/IdentityController.php
+++ b/controllers/front/IdentityController.php
@@ -63,6 +63,10 @@ class IdentityControllerCore extends FrontController
}
}
+ if (Configuration::get('PS_CUSTOMER_NATIONALITY') && Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY') && !Tools::getValue('id_nationality')) {
+ $this->errors[] = Tools::displayError('Nationality is required.');
+ }
+
if (Tools::getIsset('old_passwd')) {
$old_passwd = trim(Tools::getValue('old_passwd'));
}
@@ -91,6 +95,7 @@ class IdentityControllerCore extends FrontController
if (!count($this->errors)) {
$this->customer->phone = $phone;
+ $this->customer->id_country = (int)Tools::getValue('id_nationality');
$this->customer->id_default_group = (int)$prev_id_default_group;
$this->customer->firstname = Tools::ucwords($this->customer->firstname);
@@ -127,6 +132,7 @@ class IdentityControllerCore extends FrontController
} else {
$_POST = array_map('stripslashes', $this->customer->getFields());
$_POST['phone'] = $this->customer->phone;
+ $_POST['id_nationality'] = $this->customer->id_country;
}
return $this->customer;
@@ -167,6 +173,9 @@ class IdentityControllerCore extends FrontController
$newsletter = Configuration::get('PS_CUSTOMER_NWSL') || (Module::isInstalled('blocknewsletter') && Module::getInstanceByName('blocknewsletter')->active);
$this->context->smarty->assign('birthday', (bool) Configuration::get('PS_CUSTOMER_BIRTHDATE'));
+ $this->context->smarty->assign('nationality', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY'));
+ $this->context->smarty->assign('nationality_mandatory', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY'));
+ $this->context->smarty->assign('nationality_countries', Customer::getNationalities($this->context->language->id));
$this->context->smarty->assign('newsletter', $newsletter);
$this->context->smarty->assign('optin', (bool)Configuration::get('PS_CUSTOMER_OPTIN'));
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index f00addd43..074b69f0a 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -114,8 +114,6 @@ class OrderConfirmationControllerCore extends FrontController
$any_back_order = 0;
$processed_product = array();
$orderTotalInfo = array();
- $orderTotalInfo['total_demands_price_te'] = 0;
- $orderTotalInfo['total_demands_price_ti'] = 0;
$orderTotalInfo['total_products_te'] = 0;
$orderTotalInfo['total_products_ti'] = 0;
$orderTotalInfo['total_rooms_te'] = 0;
@@ -135,6 +133,7 @@ class OrderConfirmationControllerCore extends FrontController
$orderTotalInfo['total_paid_real'] = 0;
$orderTotalInfo['total_wrapping'] = 0;
$orderTotalInfo['total_order_amount'] = 0;
+ $orderTotalInfo['total_tourism_tax'] = 0.0;
$orders_has_invoice = 1;
if ($cartOrders = Order::getAllOrdersByCartId($order->id_cart)) {
@@ -144,7 +143,6 @@ class OrderConfirmationControllerCore extends FrontController
$obj_rm_type = new HotelRoomType();
$orderTotalInfo['total_order_amount'] = 0;
$hotelCartBookingData = new HotelCartBookingData();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
$cart_standalone_service_products = array();
$cart_hotel_service_products = array();
@@ -154,6 +152,7 @@ class OrderConfirmationControllerCore extends FrontController
$idOrder = $cartOrder['id_order'];
$objCartOrder = new Order($idOrder);
$orderProducts = $objCartOrder->getProducts();
+ $roomTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($idOrder, OrderTaxDetail::SCOPE_ROOM);
if (!empty($orderProducts)) {
foreach ($orderProducts as $type_key => $type_value) {
@@ -189,6 +188,7 @@ class OrderConfirmationControllerCore extends FrontController
$order_details_obj = new OrderDetail($data_v['id_order_detail']);
$cart_htl_data[$type_key]['name'] = $order_details_obj->product_name;
$stage_name = '';
+ $roomTotalPriceTaxIncl = (float) $data_v['total_price_tax_incl'];
if (isset($cart_htl_data[$type_key]['date_diff'][$date_join])) {
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] += 1;
@@ -200,8 +200,8 @@ class OrderConfirmationControllerCore extends FrontController
//// By webkul New way to calculate product prices with feature Prices
$cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days;
- $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days;
- $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl'];
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $roomTotalPriceTaxIncl/$num_days;
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $roomTotalPriceTaxIncl;
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order'];
if ($data_v['is_back_order']) {
@@ -223,8 +223,8 @@ class OrderConfirmationControllerCore extends FrontController
// By webkul New way to calculate product prices with feature Prices
$cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days;
- $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days;
- $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl'];
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $roomTotalPriceTaxIncl/$num_days;
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $roomTotalPriceTaxIncl;
$cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl'];
if ($data_v['is_back_order']) {
$any_back_order = 1;
@@ -235,43 +235,6 @@ class OrderConfirmationControllerCore extends FrontController
}
// $orderTotalInfo['total_rooms_te'] += $data_v['total_price_tax_excl'];
// $orderTotalInfo['total_rooms_ti'] += $data_v['total_price_tax_incl'];
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to']
- );
- if (empty($cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) {
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0;
- }
- $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI;
- if (empty($cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) {
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0;
- }
- $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $idOrder,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0
- );
- $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE;
- $orderTotalInfo['total_demands_price_ti'] += $extraDemandPriceTI;
- $orderTotalInfo['total_demands_price_te'] += $extraDemandPriceTE;
$cart_htl_data[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl;
$cart_htl_data[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl;
$cart_htl_data[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl;
@@ -283,7 +246,7 @@ class OrderConfirmationControllerCore extends FrontController
//enter hotel name
$cart_htl_data[$type_key]['hotel_name'] = $data_v['hotel_name'];
- // add additional services products in hotel detail.
+ // add extra services products in hotel detail.
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
0,
@@ -299,7 +262,7 @@ class OrderConfirmationControllerCore extends FrontController
if (empty($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) {
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0;
}
- $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $extraDemandPriceTI = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
0,
0,
@@ -314,7 +277,7 @@ class OrderConfirmationControllerCore extends FrontController
if (empty($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) {
$cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0;
}
- $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $extraDemandPriceTE = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
0,
0,
@@ -432,13 +395,18 @@ class OrderConfirmationControllerCore extends FrontController
$orderTotalInfo['total_tax'] += $objCartOrder->total_paid_tax_incl - $objCartOrder->total_paid_tax_excl;
$orderTotalInfo['total_paid'] += $objCartOrder->total_paid;
$orderTotalInfo['total_paid_real'] += $objCartOrder->total_paid_real;
+
+ $orderTotalInfo['total_tourism_tax'] += OrderTaxDetail::getOrderTourismTaxTotal($idOrder);
}
- $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti'] + $orderTotalInfo['total_standalone_products_ti'];
+ $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_standalone_products_ti'];
- $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te'] + $orderTotalInfo['total_standalone_products_te'];
+ $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_standalone_products_te'];
- $orderTotalInfo['total_tax_without_discount'] = $totalTaxIncl - $totalTaxExcl;
+ $orderTotalInfo['total_tax_without_discount'] = ($totalTaxIncl - $totalTaxExcl) - $orderTotalInfo['total_tourism_tax'];
+ if ($orderTotalInfo['total_tax_without_discount'] < 0) {
+ $orderTotalInfo['total_tax_without_discount'] = 0;
+ }
}
$this->context->smarty->assign('orderTotalInfo', $orderTotalInfo);
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 217d296f4..6bc12b74f 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -87,8 +87,8 @@ class OrderDetailControllerCore extends FrontController
//To show order details properly on order history page
$objBookingDetail = new HotelBookingDetail();
$objRoomType = new HotelRoomType();
- $objBookingDemand = new HotelBookingDemands();
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
+ $roomTourismTaxByBooking = OrderTaxDetail::getAppliedTourismTaxTotals($order->id, OrderTaxDetail::SCOPE_ROOM);
$anyBackOrder = 0;
$processedProducts = array();
$cartHotelData = array();
@@ -96,8 +96,6 @@ class OrderDetailControllerCore extends FrontController
$hotelServiceProducts = array();
$standaloneServiceProducts = array();
$serviceProductsFormatted = array();
- $total_demands_price_te = 0;
- $total_demands_price_ti = 0;
$total_convenience_fee_te = 0;
$total_convenience_fee_ti = 0;
$roomTypes = array();
@@ -132,8 +130,6 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['id_product'] = $type_value['product_id'];
$cartHotelData[$type_key]['cover_img'] = $type_value['cover_img'];
-
- $objBookingDemand = new HotelBookingDemands();
foreach ($order_bk_data as $data_k => $data_v) {
$date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']);
@@ -150,6 +146,8 @@ class OrderDetailControllerCore extends FrontController
$bookingRefundDetail = reset($bookingRefundDetail);
}
+ $roomTotalPriceTaxIncl = (float) $data_v['total_price_tax_incl'];
+
if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) {
$cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1;
@@ -160,10 +158,10 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children'];
$cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days;
- $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days;
+ $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $roomTotalPriceTaxIncl/$num_days;
$cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'];
$cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'];
- $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl'];
+ $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $roomTotalPriceTaxIncl;
$cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl'];
$cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order'];
if ($data_v['is_back_order']) {
@@ -187,10 +185,10 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children'];
$cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days;
- $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days;
+ $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $roomTotalPriceTaxIncl/$num_days;
$cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'];
$cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'];
- $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl'];
+ $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $roomTotalPriceTaxIncl;
$cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl'];
$cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order'];
if ($data_v['is_back_order']) {
@@ -227,41 +225,6 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id'];
$cartHotelData[$type_key]['date_diff'][$date_join]['ids_rooms'][] = $data_v['id_room'];
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $type_value['product_id'],
- 0,
- $data_v['date_from'],
- $data_v['date_to']
- );
- if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) {
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0;
- }
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 1
- );
- if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) {
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0;
- }
- $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands(
- $id_order,
- $type_value['product_id'],
- $data_v['id_room'],
- $data_v['date_from'],
- $data_v['date_to'],
- 0,
- 1,
- 0
- );
- $total_demands_price_ti += $extraDemandPriceTI;
- $total_demands_price_te += $extraDemandPriceTE;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl;
$cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl;
@@ -271,7 +234,7 @@ class OrderDetailControllerCore extends FrontController
$cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff;
$cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name'];
- // add additional services products in hotel detail.
+ // add extra services products in hotel detail.
$cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$id_order,
0,
@@ -422,6 +385,7 @@ class OrderDetailControllerCore extends FrontController
}
}
+ $totalTourismTax = OrderTaxDetail::getOrderTourismTaxTotal((int) $id_order);
$this->context->smarty->assign(
array(
@@ -429,8 +393,7 @@ class OrderDetailControllerCore extends FrontController
'THEME_DIR' => _THEME_DIR_,
'total_convenience_fee_ti' => $total_convenience_fee_ti,
'total_convenience_fee_te' => $total_convenience_fee_te,
- 'total_demands_price_ti' => $total_demands_price_ti,
- 'total_demands_price_te' => $total_demands_price_te,
+ 'total_tourism_tax' => $totalTourismTax,
'any_back_order' => $anyBackOrder,
'shw_bo_msg' => Configuration::get('WK_SHOW_MSG_ON_BO'),
'back_ord_msg' => Configuration::get('WK_BO_MESSAGE'),
@@ -519,9 +482,9 @@ class OrderDetailControllerCore extends FrontController
$this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl');
}
- public function displayAjaxGetRoomTypeBookingDemands()
+ public function displayAjaxgetRoomTypeBookingServices()
{
- $response = array('extra_demands' => false);
+ $response = array('extra_services' => false);
$idOrder = (int) Tools::getValue('id_order');
$order = new Order($idOrder);
@@ -538,26 +501,11 @@ class OrderDetailControllerCore extends FrontController
&& ($dateFrom = Tools::getValue('date_from'))
&& ($dateTo = Tools::getValue('date_to'))
) {
- $objHotelBookingDemands = new HotelBookingDemands();
$useTax = 0;
if (Group::getPriceDisplayMethod($this->context->customer->id_default_group) == PS_TAX_INC) {
$useTax = 1;
}
- if ($extraDemands = $objHotelBookingDemands->getRoomTypeBookingExtraDemands(
- $idOrder,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo,
- 1,
- 0,
- $useTax
- )) {
- $this->context->smarty->assign(array(
- 'useTax' => $useTax,
- 'extraDemands' => $extraDemands,
- ));
- }
+
$objServiceProductOrderDetail = new ServiceProductOrderDetail();
if ($additionalServices = $objServiceProductOrderDetail->getRoomTypeServiceProducts(
$idOrder,
@@ -581,7 +529,7 @@ class OrderDetailControllerCore extends FrontController
'objOrder' => $order,
));
- $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
+ $response['extra_services'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl');
}
$this->ajaxDie(json_encode($response));
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index d1814c445..a5aa6a352 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -126,6 +126,7 @@ class OrderOpcControllerCore extends ParentOrderController
}
$this->context->customer->phone = $phone;
+ $this->context->customer->id_country = (int)Tools::getValue('id_nationality');
$_POST['lastname'] = $_POST['customer_lastname'];
$_POST['firstname'] = $_POST['customer_firstname'];
$this->errors = array_merge($this->errors, $this->context->customer->validateController());
@@ -376,14 +377,10 @@ class OrderOpcControllerCore extends ParentOrderController
$this->context->cart->setNoMultishipping();
$this->ajaxDie();
break;
- case 'getRoomTypeBookingDemands':
+ case 'getRoomTypeBookingServices':
$this->ajaxDie($this->getRoomTypeBookingServices());
exit;
break;
- case 'changeRoomDemands':
- $this->ajaxDie($this->changeRoomDemands());
- exit;
- break;
case 'getCustomerGuestDetail':
$this->ajaxDie($this->getCustomerGuestDetail());
exit;
@@ -495,15 +492,9 @@ class OrderOpcControllerCore extends ParentOrderController
$this->context->smarty->assign('checkout_process_steps', $this->checkoutProcess->getSteps());
- // set room type demands
- // $objGlobalDemand = new HotelRoomTypeGlobalDemand();
- // $allDemands = $objGlobalDemand->getAllDemands();
- // $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$this->_assignCheckoutVars();
$this->context->smarty->assign(
array(
- // 'allDemands' => $allDemands,
- // 'defaultcurrencySign' => $objCurrency->sign,
'PS_REGISTRATION_PROCESS_TYPE' => Configuration::get('PS_REGISTRATION_PROCESS_TYPE'),
'free_shipping' => $free_shipping,
'isGuest' => isset($this->context->cookie->is_guest) ? $this->context->cookie->is_guest : 0,
@@ -559,6 +550,9 @@ class OrderOpcControllerCore extends ParentOrderController
$newsletter = Module::isInstalled('blocknewsletter') && Module::getInstanceByName('blocknewsletter')->active && Configuration::get('PS_CUSTOMER_NWSL');
$this->context->smarty->assign('birthday', (bool) Configuration::get('PS_CUSTOMER_BIRTHDATE'));
+ $this->context->smarty->assign('nationality', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY'));
+ $this->context->smarty->assign('nationality_mandatory', (bool) Configuration::get('PS_CUSTOMER_NATIONALITY_MANDATORY'));
+ $this->context->smarty->assign('nationality_countries', Customer::getNationalities($this->context->language->id));
$this->context->smarty->assign('newsletter', $newsletter);
$this->context->smarty->assign('optin', (bool)Configuration::get('PS_CUSTOMER_OPTIN'));
$this->context->smarty->assign('field_required', $this->context->customer->validateFieldsRequiredDatabase());
@@ -645,6 +639,7 @@ class OrderOpcControllerCore extends ParentOrderController
'id_country' => (int)$address_delivery->id_country,
'id_state' => (int)$address_delivery->id_state,
'id_gender' => (int)$customer->id_gender,
+ 'id_nationality' => (int)$customer->id_country,
'phone' => $customer->phone,
'sl_year' => $birthday[0],
'sl_month' => $birthday[1],
@@ -950,41 +945,18 @@ class OrderOpcControllerCore extends ParentOrderController
&& ($dateTo = Tools::getValue('date_to'))
) {
$objCartBookingData = new HotelCartBookingData();
- if ($selectedRoomDemands = $objCartBookingData->getCartExtraDemands(
- $this->context->cart->id,
- $idProduct,
- 0,
- $dateFrom,
- $dateTo
- )) {
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- foreach ($selectedRoomDemands as &$selectedDemand) {
- if (isset($selectedDemand['extra_demands']) && $selectedDemand['extra_demands']) {
- $extraDmd = array();
- foreach ($selectedDemand['extra_demands'] as $sDemand) {
- $selectedDemand['selected_global_demands'][] = $sDemand['id_global_demand'];
- $extraDmd[$sDemand['id_global_demand'].'-'.$sDemand['id_option']] = $sDemand;
- }
- $selectedDemand['extra_demands'] = $extraDmd;
- }
- }
- $this->context->smarty->assign('roomTypeDemands', $roomTypeDemands);
- $this->context->smarty->assign('selectedRoomDemands', $selectedRoomDemands);
-
- }
- }
$objServiceProductCartDetail = new ServiceProductCartDetail();
$objRoomTypeServiceProduct = new RoomTypeServiceProduct();
$roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, true, 1);
$cartBookings = $objCartBookingData->getHotelCartRoomsInfoByRoomType($this->context->cart->id, $idProduct,$dateFrom, $dateTo);
+ $availableServicePricing = $objRoomTypeServiceProduct->getServiceProductsPricingForCartBookings(
+ $roomTypeServiceProducts,
+ $cartBookings,
+ $idProduct,
+ $dateFrom,
+ $dateTo
+ );
+
foreach($cartBookings as &$cartBookingData) {
$cartBookingData['selected_service'] = $objServiceProductCartDetail->getServiceProductsInCart(
$cartBookingData['id_cart'],
@@ -1000,36 +972,35 @@ class OrderOpcControllerCore extends ParentOrderController
null,
1
);
+ foreach ($cartBookingData['selected_service'] as &$selectedService) {
+ if ($selectedService['tourism_tax'] > 0 && TaxConfiguration::isGrossedUp($selectedService['tourism_tax'])) {
+ $selectedService['total_price_tax_incl'] += $selectedService['tourism_tax'];
+ $quantity = $selectedService['quantity'] ?: 1;
+ $impliedNumDays = $selectedService['unit_price_tax_excl'] > 0 ? $selectedService['total_price_tax_excl'] / ($selectedService['unit_price_tax_excl'] * $quantity) : 1;
+ $unitDivisor = $impliedNumDays * $quantity;
+ $selectedService['unit_price_tax_incl'] += $unitDivisor > 0 ? ($selectedService['tourism_tax'] / $unitDivisor) : 0;
+ }
+ }
+ unset($selectedService);
+
+ $cartBookingData['available_service_pricing'] = isset($availableServicePricing[$cartBookingData['id']])
+ ? $availableServicePricing[$cartBookingData['id']]
+ : array();
}
+ unset($cartBookingData);
$this->context->smarty->assign(array(
'roomTypeServiceProducts' => $roomTypeServiceProducts,
'cartRooms' => $cartBookings
));
}
}
- $response['extra_demands'] = $this->context->smarty->fetch(
- _PS_THEME_DIR_.'_partials/cart_booking_demands.tpl'
+ $response['extra_services'] = $this->context->smarty->fetch(
+ _PS_THEME_DIR_.'_partials/cart_booking_services.tpl'
);
return json_encode($response);
}
- public function changeRoomDemands()
- {
- if ($idCartBooking = Tools::getValue('id_cart_booking')) {
- if (Validate::isLoadedObject($objCartbookingCata = new HotelCartBookingData($idCartBooking))) {
- $roomDemands = Tools::getValue('room_demands');
- $roomDemands = json_decode($roomDemands, true);
- $roomDemands = json_encode($roomDemands);
- $objCartbookingCata->extra_demands = $roomDemands;
- if ($objCartbookingCata->save()) {
- die('1');
- }
- }
- }
- die('0');
- }
-
public function getCustomerGuestDetail()
{
$response = array('status' => false);
diff --git a/controllers/front/OurPropertiesController.php b/controllers/front/OurPropertiesController.php
index 06520f044..3df472859 100644
--- a/controllers/front/OurPropertiesController.php
+++ b/controllers/front/OurPropertiesController.php
@@ -49,7 +49,7 @@ class OurPropertiesControllerCore extends FrontController
&& $hotel['id_cover_img']
&& Validate::isLoadedObject($objHotelImage = new HotelImage($hotel['id_cover_img']))
) {
- $htlImgLink = $this->context->link->getMediaLink($objHotelImage->getImageLink($hotel['id_cover_img'], ImageType::getFormatedName('medium')));
+ $htlImgLink = $this->context->link->getMediaLink($objHotelImage->getImageLink($hotel['id_cover_img'], ImageType::getFormatedName('large')));
if ((bool)Tools::file_get_contents($htlImgLink)) {
$hotelsInfo[$hotelKey]['image_url'] = $htlImgLink;
} else {
@@ -128,7 +128,6 @@ class OurPropertiesControllerCore extends FrontController
array(
'hotelsInfo' => $hotelsInfo,
'hotelLocationArray' => $hotelLocationArray,
- 'viewOnMap' => Configuration::get('WK_GOOGLE_ACTIVE_MAP'),
'displayHotelMap' => $displayHotelMap,
'WK_HTL_SHORT_DESC' => Configuration::get('WK_HTL_SHORT_DESC', $this->context->language->id),
'currentIndex' => $this->context->link->getPageLink('our-properties')
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index a519c3305..e49dfc4ae 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -345,6 +345,14 @@ class ParentOrderControllerCore extends FrontController
[Product::SELLING_PREFERENCE_STANDALONE]
);
+ foreach ($standaloneProducts as &$standaloneProduct) {
+ if (TaxConfiguration::isGrossedUp($standaloneProduct['tourism_tax_amount'])) {
+ $standaloneProduct['unit_price_tax_incl'] += $standaloneProduct['tourism_tax_amount'] / max(1, (int) $standaloneProduct['quantity']);
+ $standaloneProduct['total_price_tax_incl'] += $standaloneProduct['tourism_tax_amount'];
+ }
+ }
+ unset($standaloneProduct);
+
if (count($standaloneProducts)) {
$this->context->smarty->assign('standalone_products', $standaloneProducts);
}
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index decd83c62..22c89bba8 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -49,6 +49,7 @@ class ProductControllerCore extends FrontController
$this->addJS(array(
_THEME_JS_DIR_.'tools.js', // retro compat themes 1.5
_THEME_JS_DIR_.'product.js',
+ _THEME_JS_DIR_.'room-type-service-products.js',
));
} else {
$this->addJqueryPlugin(array('scrollTo', 'serialScroll'));
@@ -402,17 +403,6 @@ class ProductControllerCore extends FrontController
);
}
- // get room type additional demands
- $objRoomDemands = new HotelRoomTypeDemand();
- if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($this->product->id)) {
- foreach ($roomTypeDemands as &$demand) {
- // if demand has advance options then set demand price as first advance option price.
- if (isset($demand['adv_option']) && $demand['adv_option']) {
- $demand['price'] = current($demand['adv_option'])['price'];
- }
- }
- }
-
$roomFeatures = $this->product->getFrontFeatures($this->context->language->id);
$roomAmenities = HotelRoomTypeAmenities::getAmenities($this->product->id, $this->context->language->id);
$hotelAmenities = HotelBranchAmenities::getAmenities($hotel_id, $this->context->language->id);
@@ -420,7 +410,6 @@ class ProductControllerCore extends FrontController
$this->context->smarty->assign(
array(
'id_hotel' => $hotel_id,
- 'room_type_demands' => $roomTypeDemands,
'room_type_info' => $room_info_by_product_id,
'isHotelRefundable' => $hotel_branch_obj->isRefundable(),
'max_order_date' => $max_order_date,
@@ -478,7 +467,6 @@ class ProductControllerCore extends FrontController
);
}
}
-
$this->assignBookingFormVars($this->product->id, $date_from, $date_to, $occupancy_value);
$this->assignRoomServiceProductVars();
@@ -491,6 +479,36 @@ class ProductControllerCore extends FrontController
$feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay($this->product->id, $date_from, $date_to, false, 0, 0, 0, 0, 1, 1, $occupancy_value);
}
$productPriceWithoutReduction = $this->product->getPriceWithoutReduct(!$useTax);
+ if ($useTax && (bool) Configuration::get('QLO_TOURISM_TAX_GROSSED_UP')) {
+ $totalExclTourismTax = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
+ $this->product->id,
+ $date_from,
+ $date_to,
+ $occupancy_value,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0
+ );
+ $totalInclTourismTax = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
+ $this->product->id,
+ $date_from,
+ $date_to,
+ $occupancy_value,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 0,
+ true
+ );
+ $tourismTaxTotal = $totalInclTourismTax['total_price_tax_incl'] - $totalExclTourismTax['total_price_tax_incl'];
+ $numDaysInDuration = HotelHelper::getNumberOfDays($date_from, $date_to);
+ $productPriceWithoutReduction += $tourismTaxTotal / $numDaysInDuration;
+ }
$feature_price_diff = (float)($productPriceWithoutReduction - $feature_price);
$this->context->smarty->assign('feature_price', $feature_price);
$this->context->smarty->assign('feature_price_diff', $feature_price_diff);
@@ -531,7 +549,6 @@ class ProductControllerCore extends FrontController
array(
'product_controller_url' => $this->context->link->getPageLink('product'),
'ratting_img_path' => _MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icons-sprite.png',
- 'WK_PRICE_CALC_METHOD_EACH_DAY' => HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY,
'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
'customizationFields' => $customization_fields,
'id_customization' => empty($customization_datas) ? null : $customization_datas[0]['id_customization'],
@@ -624,7 +641,6 @@ class ProductControllerCore extends FrontController
$dateFrom,
$dateTo,
$occupancy = array(),
- $jsonDemands = '',
$roomServiceProducts = null
) {
$objProduct = new Product($idProduct, true, $this->context->language->id, $this->context->shop->id);
@@ -637,8 +653,6 @@ class ProductControllerCore extends FrontController
$objHotel = new HotelBranchInformation();
$objHotelCartBookingData = new HotelCartBookingData();
$objBookingDetail = new HotelBookingDetail();
- $objHRTDemand = new HotelRoomTypeDemand();
- $objHRTDemandPrice = new HotelRoomTypeDemandPrice();
$idCart = (int) $this->context->cart->id;
$idGuest = (int) $this->context->cart->id_guest;
@@ -726,6 +740,7 @@ class ProductControllerCore extends FrontController
// calculate room type price first
$useTax = HotelBookingDetail::useTax();
$totalPrice = 0;
+ $includeTourismTax = $useTax && Configuration::get('QLO_TOURISM_TAX_GROSSED_UP');
$priceWithoutDiscount = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$idProduct,
$dateFrom,
@@ -736,13 +751,21 @@ class ProductControllerCore extends FrontController
0,
0,
1,
- 0
+ 0,
+ $includeTourismTax
);
$roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice(
$idProduct,
$dateFrom,
$dateTo,
- $occupancy
+ $occupancy,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ $includeTourismTax
);
$featurePrice = 0;
@@ -760,9 +783,8 @@ class ProductControllerCore extends FrontController
1,
$occupancy
);
- $roomTypeDateRangePrice = $roomTypeDateRangePrice['total_price_tax_incl'];
$totalPriceWithoutDiscount = $priceWithoutDiscount['total_price_tax_incl'];
-
+ $roomTypeDateRangePrice = $roomTypeDateRangePrice['total_price_tax_incl'];
} else {
$featurePrice = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay(
$idProduct,
@@ -782,57 +804,18 @@ class ProductControllerCore extends FrontController
}
$totalRoomPrice = $roomTypeDateRangePrice;
- // calculate demand price now
- $demandsPricePerRoom = 0;
- $roomTypeDemands = $objHRTDemand->getRoomTypeDemands($idProduct);
- if ($jsonDemands !== '') {
- $cartDemands = json_decode($jsonDemands, true);
- $demandsPricePerRoom = $objHRTDemandPrice->getRoomTypeDemandsTotalPrice(
- $idProduct,
- $cartDemands,
- $useTax,
- $dateFrom,
- $dateTo
- );
-
- // send demand info to booking form
- foreach($cartDemands as &$demand) {
- if (Validate::isLoadedObject(
- $objRoomTypeGlobalDemand = new HotelRoomTypeGlobalDemand($demand['id_global_demand'], $this->context->language->id)
- )) {
- $demand['name'] = $objRoomTypeGlobalDemand->name;
- if ($demand['id_option']) {
- if (Validate::isLoadedObject($objDemandAdvanceOption = new HotelRoomTypeGlobalDemandAdvanceOption($demand['id_option'], $this->context->language->id))) {
- if ($objDemandAdvanceOption->id_global_demand != $objRoomTypeGlobalDemand->id) {
- unset($demand);
- continue;
- }
- $demand['advance_option'] = array(
- 'id_option' => $objDemandAdvanceOption->id,
- 'name' => $objDemandAdvanceOption->name
- );
- } else {
- unset($demand);
- continue;
- }
- }
-
- $demand['price'] = HotelRoomTypeDemand::getPriceStatic(
- $idProduct,
- $objRoomTypeGlobalDemand->id,
- $demand['id_option'],
- $useTax
- );
- }
- }
- $smartyVars['selected_demands'] = $cartDemands;
- }
+ // calculate service product price now
+ $serviceProductPricePerRoom = 0;
if ($roomServiceProducts) {
$serviceProductsPrice = 0;
if ($roomServiceProducts = json_decode($roomServiceProducts, true)) {
$objRoomTypeServiceProductPrice = new RoomTypeServiceProductPrice();
$objRoomTypeServiceProduct = new RoomTypeServiceProduct();
+ $serviceOccupancy = (is_array($occupancy) && isset($occupancy[0])) ? $occupancy[0] : array('adults' => 1, 'child_ages' => array());
+ $serviceNumAdults = isset($serviceOccupancy['adults']) ? (int) $serviceOccupancy['adults'] : 1;
+ $serviceChildAges = !empty($serviceOccupancy['child_ages']) ? (array) $serviceOccupancy['child_ages'] : array();
+
foreach ($roomServiceProducts as &$product) {
if (!$objRoomTypeServiceProduct->isRoomTypeLinkedWithProduct($idProduct, $product['id_product'])) {
unset($product);
@@ -857,20 +840,29 @@ class ProductControllerCore extends FrontController
$useTax,
$product['quantity'],
$dateFrom,
- $dateTo
+ $dateTo,
+ false,
+ null,
+ 1,
+ null,
+ 0,
+ $useTax && Configuration::get('QLO_TOURISM_TAX_GROSSED_UP'),
+ $serviceNumAdults,
+ $serviceChildAges
);
+
$product['price'] = $productPrice;
$serviceProductsPrice += $productPrice;
}
$smartyVars['selected_service_product'] = $roomServiceProducts;
}
- $demandsPricePerRoom += $serviceProductsPrice;
+ $serviceProductPricePerRoom += $serviceProductsPrice;
$totalPrice += $serviceProductsPrice;
}
// multiply price by number of room required
- $demandsPrice = $demandsPricePerRoom * $quantity;
+ $serviceProductPrice = $serviceProductPricePerRoom * $quantity;
// calculate total price
- $totalPrice = $totalRoomPrice + $demandsPrice;
+ $totalPrice = $totalRoomPrice + $serviceProductPrice;
// send occupancy information searched by the user
if ($occupancy && is_array($occupancy)) {
$smartyVars['occupancies'] = $occupancy;
@@ -893,11 +885,10 @@ class ProductControllerCore extends FrontController
$smartyVars['los_max_days'] = $losMaxDays;
$smartyVars['los_min_failed'] = $losMinFailed;
$smartyVars['los_max_failed'] = $losMaxFailed;
- $smartyVars['has_room_type_demands'] = $roomTypeDemands ? true : false; // whether to show price breakup
$smartyVars['rooms_price'] = $totalRoomPrice;
- $smartyVars['demands_price_per_room'] = $demandsPricePerRoom;
- $smartyVars['total_price_without_discount'] = $totalPriceWithoutDiscount + $demandsPrice;
- $smartyVars['demands_price'] = $demandsPrice;
+ $smartyVars['service_product_price_per_room'] = $serviceProductPricePerRoom;
+ $smartyVars['total_price_without_discount'] = $totalPriceWithoutDiscount + $serviceProductPrice;
+ $smartyVars['service_product_price'] = $serviceProductPrice;
$smartyVars['total_price'] = $totalPrice;
$this->context->smarty->assign($smartyVars);
return true;
@@ -924,43 +915,75 @@ class ProductControllerCore extends FrontController
}
}
$smartyVars['associated_hotels'] = $associatedHotels;
+ if (!$idHotel) {
+ // no hotel picked yet (e.g. initial page load) — price/tourism tax must match
+ // the hotel the dropdown defaults to, which is simply its first option
+ $idHotel = reset($associatedHotels)['id_hotel'];
+ }
}
}
if ($idHotel) {
$smartyVars['service_id_hotel'] = $idHotel;
}
$useTax = HotelBookingDetail::useTax();
+ $includeTourismTax = $useTax && Configuration::get('QLO_TOURISM_TAX_GROSSED_UP');
$objServiceProductOption = new ServiceProductOption();
if ($serviceProductOptions = $objServiceProductOption->getProductOptions($this->product->id)) {
foreach ($serviceProductOptions as &$serviceProductOption) {
if ($idProductOption == null) {
$idProductOption = $serviceProductOption['id_product_option'];
}
- $serviceProductOption['price'] = RoomTypeServiceProductPrice::getPrice(
+ $serviceProductOption['price'] = Product::getServiceProductPrice(
$this->product->id,
- $idHotel,
$serviceProductOption['id_product_option'],
+ $idHotel,
+ false,
$useTax,
- 1
+ 1,
+ null,
+ null,
+ false,
+ null,
+ 1,
+ null,
+ 0,
+ $includeTourismTax
);
}
}
$smartyVars['product_option'] = $serviceProductOptions;
- $smartyVars['service_price'] = RoomTypeServiceProductPrice::getPrice(
+ $smartyVars['service_price'] = Product::getServiceProductPrice(
$this->product->id,
- $idHotel,
$idProductOption,
- $useTax,
- $quantity
- );
- $smartyVars['service_price_without_reduction'] = RoomTypeServiceProductPrice::getPrice(
- $this->product->id,
$idHotel,
- $idProductOption,
+ false,
$useTax,
$quantity,
- false
+ null,
+ null,
+ false,
+ null,
+ 1,
+ null,
+ 0,
+ $includeTourismTax
+ );
+ $smartyVars['service_price_without_reduction'] = Product::getServiceProductPrice(
+ $this->product->id,
+ $idProductOption,
+ $idHotel,
+ false,
+ $useTax,
+ $quantity,
+ null,
+ null,
+ false,
+ null,
+ false,
+ null,
+ 0,
+ $includeTourismTax
);
if ($quantity) {
$smartyVars['quantity'] = $quantity;
@@ -1443,8 +1466,8 @@ class ProductControllerCore extends FrontController
$response = array('status' => false);
$idProduct = (int) Tools::getValue('id_product');
if ($this->product->booking_product) {
- $dateFrom = Tools::getValue('room_check_in');
- $dateTo = Tools::getValue('room_check_out');
+ $dateFrom = Tools::getValue('date_from');
+ $dateTo = Tools::getValue('date_to');
$occupancy = Tools::getValue('occupancy');
if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) {
if (!Validate::isOccupancy($occupancy)) {
@@ -1453,7 +1476,6 @@ class ProductControllerCore extends FrontController
} else {
$occupancy = Tools::getValue('qty', 1);
}
- $roomTypeDemands = Tools::getValue('room_type_demands');
$roomServiceProducts = Tools::getValue('room_service_products');
$dateFrom = date('Y-m-d H:i:s', strtotime($dateFrom));
$dateTo = date('Y-m-d H:i:s', strtotime($dateTo));
@@ -1463,14 +1485,13 @@ class ProductControllerCore extends FrontController
$dateFrom,
$dateTo,
$occupancy,
- $roomTypeDemands,
$roomServiceProducts
)) {
}
} else {
- $idHotel = Tools::getValue('service_id_hotel');
+ $idHotel = Tools::getValue('id_hotel');
$id_product_option = Tools::getValue('id_product_option');
- $quantity = Tools::getValue('service_product_qty');
+ $quantity = Tools::getValue('qty');
$this->assignServiceProductVars(
$id_product_option,
$quantity,
@@ -1478,6 +1499,7 @@ class ProductControllerCore extends FrontController
);
}
+ $this->context->smarty->assign('static_token', Tools::getToken(false));
$html = $this->context->smarty->fetch('_partials/booking-form.tpl');
$response['status'] = true;
$response['html_booking_form'] = $html;
diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql
index 7b5c1d473..69e4c3bef 100644
--- a/install/data/db_structure.sql
+++ b/install/data/db_structure.sql
@@ -594,6 +594,7 @@ CREATE TABLE `PREFIX_customer` (
`id_gender` int(10) unsigned NOT NULL,
`id_default_group` int(10) unsigned NOT NULL DEFAULT '1',
`id_lang` int(10) unsigned NULL,
+ `id_country` int(10) NOT NULL DEFAULT '0',
`id_risk` int(10) unsigned NOT NULL DEFAULT '1',
`company` varchar(64),
`siret` varchar(14),
@@ -1181,6 +1182,7 @@ CREATE TABLE `PREFIX_orders` (
`invoice_date` datetime NOT NULL,
`delivery_date` datetime NOT NULL,
`source` varchar(255) DEFAULT NULL,
+ `id_source` int(10) unsigned DEFAULT NULL,
`valid` int(1) unsigned NOT NULL DEFAULT '0',
`is_advance_payment` tinyint(1) NOT NULL DEFAULT '0',
`advance_paid_amount` decimal(20,6) NOT NULL DEFAULT '0.00',
@@ -1200,16 +1202,83 @@ CREATE TABLE `PREFIX_orders` (
KEY `id_shop_group` (`id_shop_group`),
KEY (`current_state`),
KEY `id_shop` (`id_shop`),
+ KEY `id_source` (`id_source`),
INDEX `date_add`(`date_add`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
-CREATE TABLE `PREFIX_order_detail_tax` (
- `id_order_detail` int(11) NOT NULL,
- `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',
- KEY (`id_order_detail`),
- KEY `id_tax` (`id_tax`)
+CREATE TABLE `PREFIX_tax_configuration` (
+ `id_tax` int(11) unsigned NOT NULL,
+ `tax_value` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `calculation_type` tinyint(1) NOT NULL DEFAULT '0',
+ `per_night` tinyint(1) NOT NULL DEFAULT '1',
+ `per_person` tinyint(1) NOT NULL DEFAULT '0',
+ `has_tiered_pricing` tinyint(1) NOT NULL DEFAULT '0',
+ `apply_on_child` tinyint(1) NOT NULL DEFAULT '0',
+ `has_child_age_range` tinyint(1) NOT NULL DEFAULT '0',
+ `child_calculation_type` tinyint(1) NOT NULL DEFAULT '0',
+ `has_multiple_valid_ranges` tinyint(1) NOT NULL DEFAULT '0',
+ `special_days` text,
+ PRIMARY KEY (`id_tax`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_tax_price_tier` (
+ `id_tax_price_tier` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id_tax` int(11) unsigned NOT NULL,
+ `min_amount` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `max_amount` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `tax_value` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ PRIMARY KEY (`id_tax_price_tier`),
+ KEY `id_tax` (`id_tax`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_tax_child_range` (
+ `id_tax_child_range` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id_tax` int(11) unsigned NOT NULL,
+ `min_age` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `max_age` tinyint(3) unsigned NOT NULL DEFAULT '17',
+ `tax_value` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ PRIMARY KEY (`id_tax_child_range`),
+ KEY `id_tax` (`id_tax`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_tax_validity_range` (
+ `id_tax_validity_range` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id_tax` int(11) unsigned NOT NULL,
+ `valid_from` date DEFAULT NULL,
+ `valid_to` date DEFAULT NULL,
+ PRIMARY KEY (`id_tax_validity_range`),
+ KEY `id_tax` (`id_tax`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_order_tax_detail` (
+ `id_order_tax_detail` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id_order` int(11) unsigned NOT NULL,
+ `id_order_detail` int(11) unsigned NOT NULL,
+ `id_htl_booking` int(11) unsigned NOT NULL,
+ `id_service_product_order_detail` int(11) unsigned NOT NULL DEFAULT '0',
+ `id_tax` int(11) unsigned NOT NULL,
+ `unit_amount` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `total_amount` decimal(20,6) NOT NULL DEFAULT '0.000000',
+ `date_add` datetime NOT NULL,
+ PRIMARY KEY (`id_order_tax_detail`),
+ KEY `id_order` (`id_order`),
+ KEY `id_order_detail` (`id_order_detail`),
+ KEY `id_htl_booking` (`id_htl_booking`),
+ KEY `id_service_product_order_detail` (`id_service_product_order_detail`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_order_tax_exemption` (
+ `id_order_tax_exemption` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `id_htl_booking` int(11) unsigned NOT NULL DEFAULT '0',
+ `id_service_product_order_detail` int(11) unsigned NOT NULL DEFAULT '0',
+ `id_order` int(11) unsigned NOT NULL,
+ `id_employee` int(11) unsigned NOT NULL,
+ `note` text,
+ `date_add` datetime NOT NULL,
+ PRIMARY KEY (`id_order_tax_exemption`),
+ KEY `id_htl_booking` (`id_htl_booking`),
+ KEY `id_service_product_order_detail` (`id_service_product_order_detail`),
+ KEY `id_order` (`id_order`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
CREATE TABLE `PREFIX_order_invoice` (
@@ -1279,6 +1348,7 @@ CREATE TABLE `PREFIX_order_detail` (
`product_supplier_reference` varchar(32) DEFAULT NULL,
`product_weight` DECIMAL(20,6) NOT NULL,
`id_tax_rules_group` INT(11) UNSIGNED DEFAULT '0',
+ `id_tourism_tax_rule_group` INT(11) UNSIGNED DEFAULT '0',
`tax_computation_method` tinyint(1) unsigned NOT NULL DEFAULT '0',
`tax_name` varchar(16) NOT NULL,
`tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0.000',
@@ -1535,6 +1605,7 @@ CREATE TABLE `PREFIX_product` (
`id_category_default` int(10) unsigned DEFAULT NULL,
`id_shop_default` int(10) unsigned NOT NULL DEFAULT 1,
`id_tax_rules_group` INT(11) UNSIGNED NOT NULL,
+ `id_tourism_tax_rules_group` INT(11) UNSIGNED NOT NULL DEFAULT '0',
`on_sale` tinyint(1) unsigned NOT NULL DEFAULT '0',
`online_only` tinyint(1) unsigned NOT NULL DEFAULT '0',
`ean13` varchar(13) DEFAULT NULL,
@@ -1598,6 +1669,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_product_shop` (
`id_shop` int(10) unsigned NOT NULL,
`id_category_default` int(10) unsigned DEFAULT NULL,
`id_tax_rules_group` INT(11) UNSIGNED NOT NULL,
+ `id_tourism_tax_rules_group` INT(11) UNSIGNED NOT NULL DEFAULT '0',
`on_sale` tinyint(1) unsigned NOT NULL DEFAULT '0',
`online_only` tinyint(1) unsigned NOT NULL DEFAULT '0',
`ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000',
@@ -1887,6 +1959,48 @@ CREATE TABLE `PREFIX_search_word` (
UNIQUE KEY `id_lang` (`id_lang`,`id_shop`, `word`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+CREATE TABLE `PREFIX_business_source` (
+ `id_business_source` int(10) unsigned NOT NULL auto_increment,
+ `code` varchar(64) NOT NULL,
+ `position` int(10) unsigned NOT NULL DEFAULT '0',
+ `unremovable` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+ `active` tinyint(1) UNSIGNED NOT NULL DEFAULT '1',
+ `deleted` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+ `date_add` datetime NOT NULL,
+ `date_upd` datetime NOT NULL,
+ PRIMARY KEY (`id_business_source`),
+ UNIQUE KEY `code` (`code`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_business_source_lang` (
+ `id_business_source` int(10) unsigned NOT NULL,
+ `id_lang` int(10) unsigned NOT NULL,
+ `name` varchar(64) NOT NULL,
+ PRIMARY KEY (`id_business_source`,`id_lang`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_source` (
+ `id_source` int(10) unsigned NOT NULL auto_increment,
+ `id_business_source` int(10) unsigned NOT NULL,
+ `code` varchar(64) NOT NULL,
+ `position` int(10) unsigned NOT NULL DEFAULT '0',
+ `unremovable` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+ `active` tinyint(1) UNSIGNED NOT NULL DEFAULT '1',
+ `deleted` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+ `date_add` datetime NOT NULL,
+ `date_upd` datetime NOT NULL,
+ PRIMARY KEY (`id_source`),
+ UNIQUE KEY `code` (`code`),
+ KEY `id_business_source` (`id_business_source`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
+CREATE TABLE `PREFIX_source_lang` (
+ `id_source` int(10) unsigned NOT NULL,
+ `id_lang` int(10) unsigned NOT NULL,
+ `name` varchar(64) NOT NULL,
+ PRIMARY KEY (`id_source`,`id_lang`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
+
CREATE TABLE `PREFIX_specific_price` (
`id_specific_price` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`id_specific_price_rule` INT(11) UNSIGNED NOT NULL,
@@ -1996,6 +2110,7 @@ CREATE TABLE `PREFIX_tag_count` (
CREATE TABLE `PREFIX_tax` (
`id_tax` int(10) unsigned NOT NULL auto_increment,
`rate` DECIMAL(10, 3) NOT NULL,
+ `is_tourism_tax` TINYINT(1) NOT NULL DEFAULT '0',
`active` tinyint(1) unsigned NOT NULL DEFAULT '1',
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id_tax`)
@@ -2121,6 +2236,7 @@ CREATE TABLE `PREFIX_tax_rules_group` (
`id_tax_rules_group` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`name` VARCHAR( 50 ) NOT NULL,
`active` INT NOT NULL,
+`is_tourism_tax_rule_group` TINYINT(1) NOT NULL DEFAULT '0',
`deleted` TINYINT(1) UNSIGNED NOT NULL,
`date_add` DATETIME NOT NULL,
`date_upd` DATETIME NOT NULL
diff --git a/install/data/xml/business_source.xml b/install/data/xml/business_source.xml
new file mode 100644
index 000000000..ec7355d81
--- /dev/null
+++ b/install/data/xml/business_source.xml
@@ -0,0 +1,23 @@
+
+'; errorHtml += '
- ';
@@ -1201,7 +1182,7 @@ $(document).ready(function() {
if (jsonData.service_panel) {
$('#room_type_service_product_desc').replaceWith(jsonData.service_panel);
}
- showSuccessMessage(txtExtraDemandSucc);
+ showSuccessMessage(txtExtraServiceSucc);
} else {
showErrorMessage(jsonData.errors);
@@ -1236,7 +1217,7 @@ $(document).ready(function() {
if (jsonData.service_panel) {
$('#room_type_service_product_desc').replaceWith(jsonData.service_panel);
}
- showSuccessMessage(txtExtraDemandSucc);
+ showSuccessMessage(txtExtraServiceSucc);
} else {
if (jsonData.errors != 'undefined' && jsonData.errors.length) {
var errorHtml = error_found_txt + ':
'; @@ -1255,157 +1236,6 @@ $(document).ready(function() { }); }); - // save room extra demand to the order - $(document).on('click', '#save_room_demands', function(e) { - e.preventDefault(); - - var idHtlBooking = parseInt($('#edit_product .extra-services-container #id_htl_booking').val()); - if (idHtlBooking) { - var roomDemands = []; - // get the selected extra demands by customer - $(this).closest('#edit_product #room_type_demands_desc').find('input:checkbox.id_room_type_demand:checked').each(function () { - roomDemands.push({ - 'id_global_demand':$(this).val(), - 'id_option': $(this).closest('.room_demand_block').find('.id_option').val(), - 'unit_price': $(this).closest('.room_demand_block').find('.unit_price').val() - }); - }); - - if (roomDemands.length) { - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_htl_booking: idHtlBooking, - room_demands: JSON.stringify(roomDemands), - action: 'addRoomExtraDemands', - ajax: true - }, - success: function(jsonData) { - if (!jsonData.hasError) { - showSuccessMessage(txtExtraDemandSucc); - if (jsonData.facilities_panel) { - $('#room_type_demands_desc').replaceWith(jsonData.facilities_panel); - } - } else if (jsonData.errors) { - showErrorMessage(jsonData.errors); - } else { - showErrorMessage(txtSomeErr); - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - } else { - showErrorMessage(atleastSelectTxt); - } - } - }); - - // edit room extra deman - $(document).on('focusout', '#edit-room-booking-modal .room_ordered_demands .unit_price', function(e) { - updateRoomDemand($(this).closest('tr')); - }); - - // Delete ordered room booking demand - $(document).on('click', '.del-order-room-demand', function(e) { - e.preventDefault(); - if (confirm(txt_confirm)) { - var idBookingDemand = $(this).attr('id_booking_demand'); - $currentItem = $(this); - if (idBookingDemand) { - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_booking_demand: idBookingDemand, - action: 'DeleteRoomExtraDemand', - ajax: true - }, - success: function(jsonData) { - if (jsonData.success) { - showSuccessMessage(txtDeleteSucc); - if (jsonData.facilities_panel) { - $('#room_type_demands_desc').replaceWith(jsonData.facilities_panel); - } - } else { - showErrorMessage(txtSomeErr); - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - } else { - showErrorMessage(txtInvalidDemandVal); - } - } - }); - - $(document).on('click', '.del_room_additional_service', function(e){ - e.preventDefault(); - if (confirm(txt_confirm)) { - var idServiceProductOrderDetail = $(this).data('id_service_product_order_detail'); - $currentItem = $(this); - if (idServiceProductOrderDetail) { - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_service_product_order_detail: idServiceProductOrderDetail, - action: 'DeleteRoomAdditionalService', - ajax: true - }, - success: function(jsonData) { - if (!jsonData.hasError) { - if (jsonData.service_panel) { - $('#room_type_service_product_desc').replaceWith(jsonData.service_panel); - } - showSuccessMessage(txtExtraDemandSucc); - } else { - showErrorMessage(jsonData.errors); - - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); - } else { - showErrorMessage(txtInvalidDemandVal); - } - } - - }); - - // change advance option of extra demand - $(document).on('change', '.demand_adv_option_block .id_option', function(e) { - var option_selected = $(this).find('option:selected'); - var extra_demand_price = option_selected.attr("optionPrice") - extra_demand_price = parseFloat(extra_demand_price); - // extra_demand_price = formatCurrency(extra_demand_price, currency_format, currency_sign, currency_blank); - $(this).closest('.room_demand_block').find('.unit_price').val(extra_demand_price); - }); - $(".textarea-autosize").autosize(); var date = new Date(); @@ -1455,7 +1285,7 @@ $(document).ready(function() { date_to: dateTo, id_htl_booking: idHtlBooking, orderEdit: orderEdit, - action: 'getRoomTypeBookingDemands', + action: 'getRoomTypeBookingServices', ajax: true }, success: function(result) { @@ -1463,7 +1293,7 @@ $(document).ready(function() { showErrorMessage(txtSomeErr); } else { $('#footer').next('.bootstrap').append(result.modalHtml); - $('#room-extra-demands').modal('show'); + $('#room-extra-services').modal('show'); } }, complete: function() { @@ -1472,8 +1302,8 @@ $(document).ready(function() { }); }); - // Empty extra-services-container when room-extra-demands modal is closed - $(document).on('hidden.bs.modal', '#room-extra-demands', function(){ + // Empty extra-services-container when room-extra-services modal is closed + $(document).on('hidden.bs.modal', '#room-extra-services', function(){ $('#footer').next('.bootstrap').empty(); }); @@ -2895,7 +2725,7 @@ function updateAdditionalServices(element) if (jsonData.service_panel) { $('#room_type_service_product_desc').replaceWith(jsonData.service_panel); } - showSuccessMessage(txtExtraDemandSucc); + showSuccessMessage(txtExtraServiceSucc); } else { showErrorMessage(jsonData.errors); @@ -2909,42 +2739,6 @@ function updateAdditionalServices(element) } -function updateRoomDemand(element) -{ - var id_booking_demand = $(element).data('id_booking_demand'); - var unit_price = $(element).find('.unit_price').val(); - $(".loading_overlay").show(); - $.ajax({ - type: 'POST', - headers: { - "cache-control": "no-cache" - }, - url: admin_order_tab_link, - dataType: 'JSON', - cache: false, - data: { - id_booking_demand: id_booking_demand, - unit_price: unit_price, - action: 'updateRoomExtraDemands', - ajax: true - }, - success: function(jsonData) { - if (!jsonData.hasError) { - if (jsonData.facilities_panel) { - $('#room_type_demands_desc').replaceWith(jsonData.facilities_panel); - } - showSuccessMessage(txtExtraDemandSucc); - } else { - showErrorMessage(jsonData.errors); - - } - }, - complete: function() { - $(".loading_overlay").hide(); - } - }); -} - function checkPartialRefundProductQuantity(it) { if (parseInt($(it).val()) > parseInt($(it).closest('td').find('.partialRefundProductQuantity').val())) diff --git a/js/admin/price.js b/js/admin/price.js index 977499823..872028722 100644 --- a/js/admin/price.js +++ b/js/admin/price.js @@ -100,6 +100,48 @@ function getEcotaxTaxIncluded() return ps_round(ecotax_tax_excl * (1 + ecotaxTaxRate), 2); } + +function getTourismTaxIncluded(priceTE) +{ + var CALCULATION_TYPE_PERCENTAGE = 1; + + if (typeof tourismTaxRatesByGroup === 'undefined' || isNaN(priceTE)) { + return 0; + } + + var selectedTourismTax = document.getElementById('id_tourism_tax_rules_group'); + if (!selectedTourismTax) { + return 0; + } + + var taxes = tourismTaxRatesByGroup[selectedTourismTax.options[selectedTourismTax.selectedIndex].value] || []; + var tourismAmount = 0; + + for (var i = 0; i < taxes.length; i++) { + var t = taxes[i]; + var baseValue = null; + + if (t.is_tiered) { + for (var j = 0; j < t.tiers.length; j++) { + var tier = t.tiers[j]; + if (priceTE >= tier.min_amount && (tier.max_amount == 0 || priceTE <= tier.max_amount)) { + baseValue = tier.tax_value; + break; + } + } + if (baseValue === null) { + continue; + } + } else { + baseValue = t.tax_value; + } + + tourismAmount += (t.tax_calc_type == CALCULATION_TYPE_PERCENTAGE) ? (priceTE * baseValue / 100) : baseValue; + } + + return tourismAmount; +} + function getEcotaxTaxExcluded() { return ecotax_tax_excl; @@ -138,7 +180,7 @@ function calcPriceTI() } else { - $('#priceTI').val((parseFloat($('#priceTI').val()) + getEcotaxTaxIncluded()).toFixed(priceDisplayPrecision)); + $('#priceTI').val((parseFloat($('#priceTI').val()) + getEcotaxTaxIncluded() + getTourismTaxIncluded(priceTE)).toFixed(priceDisplayPrecision)); $('#finalPrice').html(parseFloat($('#priceTI').val()).toFixed(priceDisplayPrecision)); } } @@ -148,6 +190,10 @@ function calcPriceTE() ecotax_tax_excl = $('#ecotax').val() / (1 + ecotaxTaxRate); var priceTI = parseFloat($('#priceTI').val().replace(/,/g, '.')); var newPrice = removeTaxes(ps_round(priceTI - getEcotaxTaxIncluded(), priceDisplayPrecision)); + var tourismTaxIncluded = getTourismTaxIncluded(newPrice); + if (tourismTaxIncluded > 0) { + newPrice = removeTaxes(ps_round(priceTI - getEcotaxTaxIncluded() - tourismTaxIncluded, priceDisplayPrecision)); + } $('#priceTE').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, 6).toFixed(6)); $('#priceTEReal').val((isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9)); diff --git a/js/admin/products.js b/js/admin/products.js index 230bd0cd0..1211a8120 100644 --- a/js/admin/products.js +++ b/js/admin/products.js @@ -594,21 +594,6 @@ product_tabs['Features'] = new function(){ displayFlags(languages, id_language, allowEmployeeFormLang); } } -product_tabs['AdditionalFacilities'] = new function(){ - this.onReady = function(){ - $('#demands_table .selected_demand').on('click', function() { - let input_block = $('#demands_table').find('.demand_price_'+$(this).val()); - if ($(this).is(':checked')) { - $(input_block).find('.price_input').show(); - $(input_block).find('.price_display').hide(); - } else { - $(input_block).find('.price_input'); - $(input_block).find('.price_input').hide(); - $(input_block).find('.price_display').show(); - } - }); - } -} /** * Update the product image list position buttons diff --git a/js/admin/sources.js b/js/admin/sources.js new file mode 100644 index 000000000..7752aa310 --- /dev/null +++ b/js/admin/sources.js @@ -0,0 +1,44 @@ +/** +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*/ + +$(document).on('click', '.merge-source-btn', function (e) { + e.preventDefault(); + + var $btn = $(this); + + $('.loading_overlay').show(); + $.ajax({ + type: 'POST', + url: $btn.data('ajax-url'), + dataType: 'JSON', + cache: false, + data: { + ajax: true, + action: 'InitMergeSourceModal', + id_source: $btn.data('id-source'), + id_business_source: $btn.data('id-business-source') + }, + success: function (result) { + if (!result.hasError && result.modalHtml) { + $('#merge_source_modal').remove(); + $('#footer').next('.bootstrap').append(result.modalHtml); + $('#merge_source_modal').modal('show'); + } else { + showErrorMessage(result.error); + } + }, + complete: function () { + $('.loading_overlay').hide(); + } + }); +}); diff --git a/js/admin/translations.js b/js/admin/translations.js new file mode 100644 index 000000000..d01463bd9 --- /dev/null +++ b/js/admin/translations.js @@ -0,0 +1,208 @@ +/* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a 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 +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*/ +$(document).ready(function () { + $('a.useSpecialSyntax').click(function () { + var syntax = $(this).find('img').attr('alt'); + $('#BoxUseSpecialSyntax .syntax span').html(syntax + "."); + }); + + $('.mails_field').on('shown.bs.collapse', function () { + // get active email + var active_email = $(this).find('.email-collapse.in'); + // get iframe container for active email + var frame = active_email.find('.email-html-frame'); + // get source url for active email + var src = frame.data('email-src'); + // get rte container for active email + var rte_textarea = active_email.find('textarea.rte-mail'); + var rte_mail_selector = rte_textarea.data('rte'); + var rte_name_match = (rte_textarea.attr('name') || '').match(/\[html\]\[(.+)\]$/); + if (!rte_name_match) { + // this template has no .html file (txt-only) - fall back to the txt textarea's name + var txt_textarea = active_email.find('textarea.rte.noEditor'); + rte_name_match = (txt_textarea.attr('name') || '').match(/\[txt\]\[(.+)\]$/); + } + var $resetBtn = $('.mail-template-reset-btn'); + if (rte_name_match) { + var name_parts = rte_name_match[1].split('|'); + var has_module = name_parts.length > 1; + $('#reset_mail_name').val(has_module ? name_parts[1] : name_parts[0]); + $('#reset_template_type').val(has_module ? EMAIL_TEMPLATE_TYPE_MODULE : EMAIL_TEMPLATE_TYPE_CORE); + $('#reset_module_name').val(has_module ? name_parts[0] : ''); + $resetBtn.prop('disabled', false); + + var reset_tooltip = has_module + ? mailResetTooltipModule.replace('{module}', name_parts[0]).replace('{iso}', $('input[name="lang"]').val()) + : mailResetTooltipCore; + $resetBtn.attr('title', reset_tooltip).attr('data-original-title', reset_tooltip).tooltip('fixTitle'); + rte_textarea + } else { + $('#reset_mail_name').val(''); + $('#reset_template_type').val(''); + $('#reset_module_name').val(''); + $resetBtn.prop('disabled', true); + $resetBtn.attr('title', '').attr('data-original-title', '').tooltip('fixTitle'); + } + var rte_mail_config = {}; + rte_mail_config['editor_selector'] = 'rte-mail-' + rte_mail_selector; + rte_mail_config['plugins'] = "colorpicker link image paste pagebreak table contextmenu filemanager table code media autoresize textcolor anchor fullpage"; + $('#translation_mails-control-actions').appendTo($(this).find('.panel-collapse.in')); + if (frame.find('iframe.email-frame').length == 0) { + // load iframe + frame.append(''); + $.ajax({ + url: 'ajax.php', + type: 'POST', + dataType: 'html', + data: { + getEmailHTML: true, + email: src + }, + success: function (result) { + var doc = frame.find('iframe')[0].contentWindow.document; + doc.open(); + doc.write(result); + doc.close(); + tinySetup(rte_mail_config); + } + }); + + } + }); + + $('.mail-variable-tag').on('click', function () { + var textarea = $(this).closest('.email-collapse').find('> .tab-content > .tab-pane.active textarea').get(0); + if (textarea) { + insertVariable(textarea, $(this).data('variable')); + } + }); + + $('.mail-template-reset-btn').on('click', function () { + var $btn = $(this); + if ($btn.prop('disabled')) { + return; + } + + var mailName = $('#reset_mail_name').val(); + if (!mailName) { + return; + } + + var templateType = $('#reset_template_type').val(); + var moduleName = $('#reset_module_name').val(); + + var $panel = $btn.closest('.email-collapse.in'); + var $htmlTextarea = $panel.find('textarea.rte-mail'); + var $txtTextarea = $panel.find('textarea.rte.noEditor'); + var $titleInput = $panel.find('input[name^="title_"]'); + var $frame = $panel.find('.email-html-frame'); + var $icon = $btn.find('.process-icon-refresh'); + + $btn.prop('disabled', true); + $icon.addClass('icon-spin'); + + $.ajax({ + url: admin_translations_link, + type: 'POST', + dataType: 'json', + data: { + ajax: true, + action: 'ResetMailTemplate', + iso_code: $('input[name="lang"]').val(), + theme: $('input[name="theme"]').val(), + mail_name: mailName, + template_type: templateType, + module_name: moduleName, + token: $('#translation_mails_token').val() + }, + success: function (result) { + $btn.prop('disabled', false); + $icon.removeClass('icon-spin'); + + if (!result || result.hasError) { + showErrorMessage((result && result.error) || mailResetErrorMsg); + return; + } + + if (result.html !== null && $htmlTextarea.length) { + var editor = (typeof tinymce !== 'undefined' && $htmlTextarea.attr('id')) ? tinymce.get($htmlTextarea.attr('id')) : null; + if (editor) { + editor.setContent(result.html); + } else { + $htmlTextarea.val(result.html); + } + + var titleMatch = result.html.match(/