diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 419fe885c..49472163a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,87 @@ +#################################### +# V1.5.0 +#################################### + +## Added Features: + +[+] CO : QloApps APIs are created (Prestashop APIs are modified as per hotel QloApps changes) +[+] CO : `is_advance_payment` column is added in the 'cart' table. +[+] CO : `is_advance_payment`, `advance_paid_amount` columns are added in the 'orders' table. +[+] CO : `id_transaction`, `payment_mode`, `refunded_amount`, `by_admin` columns are added in the 'order_return' table. +[+] CO : `id_order_return_detail`, `id_htl_booking`, `refunded_amount` columns are added in the 'order_return_detail' table. +[+] CO : `send_email_to_customer`, `send_email_to_superadmin`, `send_email_to_employee`, `send_email_to_hotelier`, denied`, `refunded`, `module_name` columns are added in the 'order_return_state' table. +[+] CO : `customer_template`, `admin_template` columns are added in the 'order_return_state_lang' table. +[+] CO : `id_htl_booking` column is added in the 'order_slip_detail' table. +[+] CO : Refund emails will be sent to the customer as per return state setting +[+] CO : All images link are now generated dynamically + +[+] FO : Room type refund policies in the policies tab is shown in the room type details page. +[+] FO : A controller will be there for the customer which will show his refund requests info + +[+] BO : Admin can enable/disable refund for the hotel +[+] BO : Refund Process:: Order return statuses improved for order refund statuses. +[+] BO : Admin can select rules for the hotel [checkboxes] +[+] BO : Admin can initiate refund if refund is enable for the system +[+] BO : Admin can select which state is considered as refunded complete in the return state. +[+] BO : Admin can select which state is considered as refunded denied in the return state. +[+] BO : Admin can select whcih email will be sent to customer and admin for the return state. + +[+] BO : Feature Price Rule: Groups wise Condition in feature price rules is added. +[+] BO : Global refund policies cms page can be selected from refund rules controller. +[+] BO : Refund can be enabled/disabled globally from refund rules controller. +[+] BO : Payment mode and transaction id can be saved for the refund. +[+] BO : Voucher slip can be generated for refund. +[+] BO : Credit slip can be generated for refund. +[+] BO : Additional facilities can be edited at the time of order editing. +[+] BO : Room type features images are used as jpg images in place of png images. + + +## Improved/changed features: + +[*] BO : Refund Process:: Order return statuses improved for order refund statuses. +[*] BO : In Additional Facilities list no price will be shown if facility have advance options. +[*] BO : Admin will be able to select a checkout date while changing status of the room from order details page. +[*] BO : Hotel category will be selected Default room type category. +[*] BO : In Room type renderlist hotel(instead of category), city, number rooms, adults, Childs columns added. +[*] BO : Merchandise Return tab is removed. +[*] BO : Room type ids now start room type id from 1 in room type render list. +[*] BO : Prestashop warning pop up will nt be shown during module installation for Webkul modules. +[*] BO : Updated addons link from store to addon's page +[*] BO : Added recomended image size for room type images for appropriate view on front end. + +[*] FO : Calendar Design is improved of date from and date to in QloApps. +[*] FO : 'Proceed' button during checkout will be disabled in case of errors while checkout. +[*] FO : Search panel is improved on all pages. +[*] FO : Cart warning text changed +[*] FO : Refund request proocess is improved for the customer. Designed is also improved. + +[*] CO : paypal adaptive module (by webkul) Removed completely from qloapps +[*] CO : All the irrelevant data creation from the installation process is removed Which is not related to Qloapps but Prestashop. e.g carriers, stores, suppliers, manufacturers...... etc. Order data will not be populated now. + +[*] CO : For refund request "order_return" and "order_return_detail" tables are used. +[*] CO : For order refund states "order_return_states" table is used. + + +## Bug/Issues Resolved: + +[-] BO : FIXED : Room does not free even after room status set to checkout. +[-] BO : FIXED : Room does not free while order status is changed to Refunded, Cancelled or Payment Error. +[-] BO : FIXED : Additional facilities price id not managed while deleting a booking from admin order details page. + +[-] FO : FIXED: when using advance payment option, discount voucher (amount) get applied to advance payment amount along with total order cost +[-] FO : FIXED : If all rows are disabled then also blocks (Interior, Rooms, Features, Testimonials) are visible on home page. +[-] FO : FIXED : Zip code error while making the guest check. +[-] FO : FIXED : Issue while creating a customer/guest from checkout page on firefox browser. +[-] FO : FIXED : Check-out date same as check-in date when current data is more than max order date for hotel +[-] FO : FIXED : customer able to process booking for inactive rooms +[-] FO : FIXED : Image strech issue on product page. +[-] FO : FIXED : Cart page not update when delete from from cart dropdown +[-] FO : FIXED : While making the guest check out the system shows zip code error in some countries. + +[-] CO : FIXED : Fatal error: Uncaught exception 'ImagickException' while creating invoice. +[-] CO : FIXED : warning while creating invoice (total demands variable issue) + + #################################### # V1.4.1 #################################### diff --git a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl index c114cfeef..013565fc8 100644 --- a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -103,7 +103,7 @@
{l s="Connect with the Qloapps community"}
-
{l s="Qloapps Addons"}
+
{l s="Qloapps Addons"}
{l s="Enhance your store Qloapps modules"}
diff --git a/admin/themes/default/template/controllers/modules/page.tpl b/admin/themes/default/template/controllers/modules/page.tpl index 1701ff48d..d39281460 100644 --- a/admin/themes/default/template/controllers/modules/page.tpl +++ b/admin/themes/default/template/controllers/modules/page.tpl @@ -24,7 +24,7 @@ *}
-

{l s='Explore all addon of Qloapps '} @{l s='Qloapps addons'}

+

{l s='Explore all addon of Qloapps '} @{l s='Qloapps addons'}

{$kpis} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 8ae14f489..282e97052 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -24,6 +24,11 @@ *} + {if $refund_allowed} + + + + {/if} {$data.room_num} @@ -32,12 +37,12 @@

{$data.room_type}

+

+ + {l s='Additional Features'} + +

{if isset($data['extra_demands']) && $data['extra_demands']} -

- - {l s='Additional Features'} - -

{convertPriceWithCurrency price=$data['extra_demands_price_ti'] currency=$currency->id}

@@ -106,38 +111,29 @@ {/if} - - -

- {if isset($data['stage_name']) && $data['stage_name']} - {$data['stage_name']} - {else} - -- + {if isset($refundReqBookings) && $refundReqBookings} + + {if isset($data.refund_info) && $data.refund_info} + {$data.refund_info.name|escape:'html':'UTF-8'} {/if} -

- - -

- {if $data['stage_name'] == 'Refunded' || $data['stage_name'] == 'Rejected'} - {l s="Done!"} - {else if $data['stage_name'] == 'Waiting' || $data['stage_name'] == 'Accepted'} - {l s="Pending..."} - {else} - -- + + + {if isset($data.refund_info) && $data.refund_info} + {convertPriceWithCurrency price=$data.refund_info.refunded_amount currency=$currency->id} {/if} -

- + + {/if} {if $data.booking_type == 1} - - {if $data['stage_name'] == 'Refunded' || $data['stage_name'] == 'Rejected'} -

----

- {else} - - {/if} - + + {if isset($data.refund_info) && ($data.refund_info.refunded || $data.refund_info.denied)} +

--

+ {else} + + {/if} + {/if} {if ($can_edit && !$order->hasBeenDelivered())} diff --git a/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl b/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl index fc38f5bb5..ddff31551 100644 --- a/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl +++ b/admin/themes/default/template/controllers/orders/_room_extra_demands.tpl @@ -1,19 +1,123 @@ -{if isset($extraDemands) && $extraDemands} - {foreach $extraDemands as $roomDemand} -
-
- {l s='Room\'s Extra Demands'} +
+

{l s='Additional Facilities'} {if isset($orderEdit) && $orderEdit}{l s='edit'}{/if} +

+
+
+
+ + {if isset($orderEdit) && $orderEdit} +

+ + +

+ + {* Already selected room demands *} +
+ + + {if isset($extraDemands) && $extraDemands} + {foreach $extraDemands as $roomDemand} + {foreach $roomDemand['extra_demands'] as $demand} + + + + + + {/foreach} + {/foreach} + {else} + + + + {/if} + +
{$demand['name']}{displayPrice price=$demand['total_price_tax_incl'] currency=$orderCurrency}
+ {l s='No additional facilities added yet.'} +
-
-
- {foreach $roomDemand['extra_demands'] as $demand} -

- {$demand['name']} - {displayPrice price=$demand['total_price_tax_incl'] currency=$orderCurrency} -

- {/foreach} + + {* Room demands available for the current editing room*} +
+
+ {if isset($roomTypeDemands) && $roomTypeDemands} + {foreach $roomTypeDemands as $idGlobalDemand => $demand} +
+
+
+
+ +
+
+

{$demand['name']|escape:'html':'UTF-8'}

+ {if isset($demand['adv_option']) && $demand['adv_option']} + + {else} + + {/if} +
+
+
+
+

{if isset($selected_adv_option) && isset($demand['adv_option'][$selected_adv_option]['price'])}{convertPrice price = $demand['adv_option'][$selected_adv_option]['price']|escape:'html':'UTF-8'}{else}{convertPrice price = $demand['price']|escape:'html':'UTF-8'}{/if}

+
+
+ {/foreach} + {/if}
-
- {/foreach} -{/if} \ No newline at end of file + {elseif isset($extraDemands) && $extraDemands} + {foreach $extraDemands as $roomDemand} +
+
+ {foreach $roomDemand['extra_demands'] as $demand} +

+ {$demand['name']} + {displayPrice price=$demand['total_price_tax_incl'] currency=$orderCurrency} +

+ {/foreach} +
+
+ {/foreach} + {/if} +
+
+
+ + +
+ + + +{* Css for handling extra demands changes *} + + diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 458b8cf0a..5421912fe 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -157,25 +157,17 @@ {/if} -->   - {if Configuration::get('PS_ORDER_RETURN')} + {if $refund_allowed && !$hasCompletelyRefunded} - {if $order->hasBeenShipped()} - {l s='Return products'} - {elseif $order->hasBeenPaid()} - {l s='Standard refund'} + {if $order->hasBeenPaid()} + {l s='Initiate refund'} {else} - {l s='Cancel products'} + {l s='Cancel bookings'} {/if}   {/if} - {if $order->hasInvoice()} - - {/if}
+ {if $returns} +
+ {l s='Booking cancellation requests has raised from this order. To see booking cancelation requests'} {l s='Click here'}. +
+ {/if}
@@ -276,7 +270,7 @@
-
+
@@ -286,44 +280,54 @@ {if isset($htl_booking_order_data) && $htl_booking_order_data} - {foreach from=$htl_booking_order_data item=data} - - - - - - - - {/foreach} + {foreach from=$htl_booking_order_data item=data} + + + + + + + + {/foreach} {else} - - - + + + {/if}
{l s='Room No.'}{l s='Order Status'}
- {$data['room_num']} - - - {$data['hotel_name']} - - - {$data['date_from']|date_format:"%d-%m-%Y"} - - {$data['date_to']|date_format:"%d-%m-%Y"} - -
- - - - - - -
-
+ {$data['room_num']} + + + {$data['hotel_name']} + + + {$data['date_from']|date_format:"%d-%m-%Y"} + + {$data['date_to']|date_format:"%d-%m-%Y"} + +
+
+ + + {if $data['id_status'] == 2}{l s='checked in on'} {$data['check_in']|date_format:"%d-%m-%Y"}{elseif $data['id_status'] == 3}{l s='checked out on'} {$data['check_out']|date_format:"%d-%m-%Y"}{/if} + + {* field for the current date *} + + + + + + +
+
+ +
+
+
{l s='No data found.'}
{l s='No data found.'}
@@ -971,6 +975,9 @@ + {if $refund_allowed} + + {/if} @@ -978,8 +985,10 @@ - - + {if isset($refundReqBookings) && $refundReqBookings} + + + {/if} {if ($can_edit && !$order->hasBeenDelivered())} @@ -1003,13 +1012,6 @@
{l s='Room No.'} {l s='Room Image'} {l s='Room Type'}{l s='Duration'} {l s='Unit Price (Tax incl.)'} {l s='Total Price (Tax incl.)'}{l s='Refund Stage'}{l s='Refund Status'}{l s='Refund State'}{l s='Refunded amount'}{l s='Reallocate Room'}{l s='Edit Order'}
- {* - - *} {capture "TaxMethod"} {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} @@ -1024,82 +1026,38 @@ {/if} {if $can_edit} -
- {if !$order->hasBeenDelivered()} - - {/if} - -
+ +
+ {if !$order->hasBeenDelivered()} + + {/if} + + + {if $refund_allowed && !$hasCompletelyRefunded} + + {/if} +
{/if}
 
-
- {*
{l s='For this customer group, prices are displayed as: [1]%s[/1]' sprintf=[$smarty.capture.TaxMethod] tags=['']} - {if !Configuration::get('PS_ORDER_RETURN')} -
{l s='Merchandise returns are disabled'} + {if !$refund_allowed} +
{l s='Refunds are disabled'} {/if}
- - *} - - {* For Due amount submit panel (by webkul) *} - {if isset($order_adv_dtl)} -
-
-
-
- - - - - - - - - - {if ($order_adv_dtl['total_order_amount'] - $order_adv_dtl['total_paid_amount']) > 0} - - - - - {/if} -
- {l s='Paid Amount'} - - - {displayPrice price=$order_adv_dtl['total_paid_amount'] currency=$currency->id} - -
- {l s='Due Amount'} - - {displayPrice price=($order_adv_dtl['total_order_amount'] - $order_adv_dtl['total_paid_amount']) currency=$currency->id} -
- {l s='submitted Amount'} - -
- {$currency->sign} - -
-
-
- {if ($order_adv_dtl['total_order_amount'] - $order_adv_dtl['total_paid_amount'])|round:2 > 0} - - {/if} -
-
-
- {/if} -
{if (sizeof($discounts) || $can_edit)} @@ -1211,174 +1169,46 @@ - {* - - {l s='Shipping'} - - {displayPrice price=$order_shipping_price currency=$currency->id} - - -
-
- {$currency->prefix} - {$currency->suffix} -
- -
-

{l s='(%s)' sprintf=$smarty.capture.TaxMethod}

- - *} - - {if isset($order_adv_dtl)} - - {l s='Paid Amount'} - - - {displayPrice price=$order_adv_dtl['total_paid_amount'] currency=$currency->id} - - + {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} + + {l s='Total Taxes'} + {displayPrice price=($order->total_paid_tax_incl - $order->total_paid_tax_excl) currency=$currency->id} + + {/if} + + {l s='Final Booking Total'} + + {displayPrice price=$order->total_paid_tax_incl currency=$currency->id} + + + + + {if isset($refundReqBookings) && $refundReqBookings} + + * {l s='Refunded Amount'} + + {displayPrice price=$refundedAmount currency=$currency->id} + + + + {/if} + + {if $order->total_paid_tax_incl > $order->total_paid_real} {l s='Due Amount'} - {displayPrice price=($order_adv_dtl['total_order_amount'] - $order_adv_dtl['total_paid_amount']) currency=$currency->id} + {displayPrice currency=$order->id_currency price=($order->total_paid_tax_incl - $order->total_paid_real)} {/if} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - - {l s='Total Taxes'} - {displayPrice price=($order->total_paid_tax_incl-$order->total_paid_tax_excl) currency=$currency->id} - - - {/if} - {assign var=order_total_price value=$order->total_paid_tax_incl} - - - {l s='Final Order Total'} - - {displayPrice price=$order_total_price currency=$currency->id} - - -
- -
@@ -1462,8 +1292,8 @@
@@ -1474,23 +1304,23 @@
- +
- +

- +
{l s='Name'}

@@ -1513,7 +1343,7 @@
- + @@ -1521,12 +1351,12 @@
- +

- +
{l s='Name'}

@@ -1546,48 +1376,89 @@
- {* MOdal for extra demands *} -