V1.1.0 released: Feature Pricing, Room Disable on specific dates

CHANGELOG.txt

@@ -1,3 +1,66 @@
+####################################
+# V1.1.0
+####################################
+
+## Added Features:
+
+[+] Project : `source` column is added in the `order` table to show the source of the booking.
+
+[+] Project : Everywhere now prices are shown according to the feature prices.
+
+[+] Project : Everywhere prestashop logo is replaced with Qloapps logo
+
+[+] BO : Feature price plans functionality has been added.
+[+] BO : Funnctionality to disable rooms for many dates is added.
+[+] BO : processConfiguration(), initFormConfiguration() are modified and validateDisableDateRanges() is added for disabled dated functionality in AdminProductsController.
+[+] BO : AdminOrdersController is modified for feature price funtionality. renderview and renderform functions also modified to display according to feature prices.
+
+[+] FO : OrderConfirmationController, OrderOpcController, OrderDetailsController and ProductControler are modified for feature price functionality. display files of the controllers also modified.
+
+[+] MO : hotelreservationsystem : ChannelManagerServices.php is added.
+[+] MO : hotelreservationsystem : ChannelOrderPayment.php is added.
+[+] MO : hotelreservationsystem : HotelCustomerAdvancedProductPayment.php is added.
+[+] MO : hotelreservationsystem : HotelRoomDisableDates.php is added.
+[+] MO : hotelreservationsystem : QloWebservice.php is added.
+[+] MO : hotelreservationsystem : WebserviceSpecificManagementQlo.php is added.
+
+[+] MO : hotelreservationsystem : ChannelManagerServices.php is added.
+[+] MO : hotelreservationsystem : HotelRoomTypeFeaturePricing.php is added.
+[+] MO : hotelreservationsystem : ChannelOrderPayment.php is added.
+[+] MO : hotelreservationsystem : getRoomMinAdvPaymentAmount() is added in HotelAdvancedPayment.php.
+[+] MO : hotelreservationsystem : createQloAppsBookingByChannels(), createQloCustomerChannelCustomerInfo(), 									createQloCustomerAddressByChannelCustomerInfo(), createQloCartForBookingFromChannel(), ProcessCreateQloOrderForChannelBooking() 		are added for Qloapps Api need  in HotelBookingDetails.php.
+[+] MO : hotelreservationsystem : 'total_price_tax_excl' and 'total_price_tax_incl' columns are added in `htl_booking_detail` table to 										store the booking time price.
+[+] MO : hotelreservationsystem : getProductFeaturePricePlanByDateByPriority(), getHotelCartBookingData() are added in 													HotelCartBookingData.php.
+[+] MO : hotelreservationsystem : 'disabled_dates' column is added in the table `htl_room_information`.
+[+] MO : hotelreservationsystem : getRoomTypeAvailableRoomsForDateRange(), getRoomTypeDisabledRoomsForDateRange(), 														getRoomTypeBookedRoomsForDateRange() are added in HotelRoomInformation.php.
+[+] MO : hotelreservationsystem : room status 'Hold For Maintenance is replace with 'Temporary incative';
+[+] MO : hotelreservationsystem : AdminHotelRoomsBookingController.php and AdminOrderRefundRequestsController.php are changed to make 										compatible with feature price functionality.
+
+## Improved/changed features:
+
+[*] MO : wkhotelroom : price of the room types are shown at home page according to feature price plans.
+[*] FO : price of the room types are shown at home page according to feature price plans.
+
+
+## Bug/Issues Resolved:
+
+[-] FO : Resolved :: issue on saving Room type information at admin product information. On saving product sometimes redirecting to renderlist.
+[-] FO : Resolved :: If admin left the 'max global date field' to be blank,then invalid dates are shown in check in-checkout fields at frontend.
+[-] FO : Resolved :: On submitting the total order cancellation request,Popup with "Parser error text" is shown. (If submit request for single room first and then for all the rooms in the order).
+[-] BO : Resolved :: Some validation issues on manage order refund rules page.
+[-] BO : Resolved :: Room type column  added on manage order refund request -> view page. (#158)
+[-] BO : Resolved :: Advance paid amount on "manage order refund request view page" is shown for the single room.(#150)
+[-] BO : Resolved :: If admin deleted the room from "order detail page",then errors are shown on the "customer order detail page".(#137)
+[-] BO : Resolved :: While reallocating the rooms,sometimes the JSON is getting breakable,due to which no room is shown for swapping & reallocation.(#133)
+[-] FO : Resolved :: While placing an order,if customer signed out on "order summary page",then error is shown. (#119)
+[-] FO : Resolved :: If filtered with any parameter on category page,then on clicking the 'Book now button',page is redirecting to the category page itself.(#118)
+[-] FO : Resolved :: On clicking to the 'add new icon',the page is redirecting to the 'assign features page' rather than 'add new features page'.(#106)
+[-] BO : Resolved :: While adding the hotel features,no success message is shown on add new features-> manage hotel features page. (#105)
+[-] BO : Resolved :: hotel interior heading and description are not changing on saving new ones.(#87)
+[-] BO : Resolved :: PlayPal..Php curl issue on installation. needs curl to be installed on server for istallation (#89)
+[-] BO : Resolved :: Many Order Edit issues resolved.
+
+
 ####################################
 # V1.0.1
 ####################################
@@ -11,15 +74,13 @@
 [*] FO : Font-family in order summary page in synced with the theme fonts now.
 
 [*] BO : Bacorder setting option is removed from Settings->General Settings.
-[*] MO : wkpaypaladaptive : Remove PHP CURL check from installation and display warning in "AdminPaymentsSetting" controller
 
 ## Fixed bugs:
 
 [-] MO : hotelreservationsystem : Fixed Google map issue on contact page.
 [-] BO : Fixed showing wrong way of payment on refund request page.
 [-] BO : Fixed showing wrong cancellation charges on refund request page.
 [-] MO : wkabouthotel : Fixed interior heading and description does not change on changing from Setting->Hotel interior Block Setting.
-[-] MO : hotelreservationsystem : refund rule bug for type percentage is resolved.
 
 
 # Change Log previous version to V1.0.0:

README.md

@@ -1,55 +1,38 @@
-QloApps
+Hotel Commerce
 --------
-Hotel Commerce plays a vital role in hotel industry as it has changed the online presence of the hotels.QloApps also known as Qlo is a Hotel Commerce Software or you can say a Hotel Booking & Reservation System. Qlo is an open source and free platform which help you to launch your own hotel booking website and manage your online & On-Desk booking easily
+Hotel Commerce is Hotel Booking  & Reservarion system . Using this you can  easily launch your hotel booking website  and even  manage your offline booking too . This package is developed on top of Prestashop 1.6.
 
 
 Demo
 --------
-FrontEnd : http://demo.qloapps.com </br>
-Backend : http://demo.qloapps.com/adminhtl/index.php </br>
+FrontEnd : http://prestashop.webkul.com/hotel-reservation/ </br>
+Backend : http://prestashop.webkul.com/hotel-reservation/adminhtl/ </br>
 username : [email protected] </br>
 Password : demodemo </br>
 
 
+
+
 Server configuration
 --------
-To install Qlo, you need a web server running PHP 5.2+ and any flavor of MySQL 5.0+ (MySQL, MariaDB, Percona Server, etc)
+
+To install HotelCommerce, you need a web server running PHP 5.2+ and any flavor of MySQL 5.0+ (MySQL, MariaDB, Percona Server, etc)
 You will also need a database administration tool, such as phpMyAdmin, in order to create a database for PrestaShop.
 We recommend the Apache or Nginx web servers.  
 
 
 Installation
 --------
-a) from Source </br>
-Please go through this blog : http://qloapps.com/install-qloapps/ for detail instruction about installation.  
-In nutshell :
-Once the files in the QloApps  archive have been decompressed and uploaded on your hosting space, go to the root of your QloApps directory with your web browser, and the QloApps installer will start automatically. Follow the instructions until QloApps is installed.
 
-b) Docker Image :</br>
-https://github.com/webkul/qloapps_docker</br>
-https://hub.docker.com/r/webkul/qloapps_docker/ </br>
-
-c) Vagrant Image :
-https://github.com/webkul/Vagrant_qloapps
+Once the files in the HotelCommerce  archive have been decompressed and uploaded on your hosting space, go to the root of your HotelCommerce directory with your web browser, and the HotelCommerce installer will start automatically. Follow the instructions until HotelCommerce is installed.
 
 
 Getting support
 --------
-If you need help using QloApps, contact the QloApps support team: [email protected]
-or raise ticket at https://webkul.uvdesk.com
-
-Webkul is known for his proactive support and already developed more than 100+ plugins on prestashop and more than 700+ plugins on other 
-platforms.
-
-
-license
---------
-OSL V3 : https://opensource.org/licenses/OSL-3.0
+If you need help using PrestaShop 1.6, contact the PrestaShop support team: [email protected]
+or raise ticket at https://webkul.com/ticket/
 
-
-Credits
---------
-Crafted with :heart: at [Webkul](http://webkul.com)
+Webkul is known for his proactive support and already developed more than 100+ plugins on prestashop and more than 700+ plugins on other opensource platforms.
 
 
-Thank you for downloading.
+Thank you for downloading .

admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl

@@ -96,6 +96,7 @@
 			</div>
 		</div>
 		<div class="col-md-12 col-lg-2">
+			{$hookDashboardZoneThree}
 			<section class="dash_news panel">
 				<h3><i class="icon-rss"></i> {l s='PrestaShop News'}</h3>
 				<div class="dash_news_content"></div>

admin/themes/default/template/controllers/login/content.tpl

@@ -25,7 +25,7 @@
 <div id="login-panel">
 	<div id="login-header">
 		<h1 class="text-center">
-			<img id="logo" src="{$img_dir}[email protected]" width="123px" height="24px" alt="PrestaShop" />
+			<img id="logo" src="{$img_dir}[email protected]" width="123px" alt="PrestaShop" />
 		</h1>
 		<div class="text-center">{$ps_version}</div>
 		<div id="error" class="hide alert alert-danger">
@@ -49,7 +49,7 @@
 		<div class="alert alert-warning">{$warningSslMessage}</div>
 		{/if}
 	</div>
-	<div id="shop-img"><img src="{$img_dir}[email protected]" alt="{$shop_name}" width="69.5px" height="118.5px" /></div>
+	<div id="shop-img"><img src="{$img_dir}[email protected]" alt="{$shop_name}" width="136px" height="136px" /></div>
 	<div class="flip-container">
 		<div class="flipper">
 			<div class="front panel">
@@ -140,16 +140,16 @@
 			</a>
 		</p>
 		<p class="text-center">
-			<a class="link-social link-twitter _blank" href="https://twitter.com/PrestaShop" title="Twitter">
+			<a class="link-social link-twitter _blank" href="https://twitter.com/qloapps" title="Twitter">
 				<i class="icon-twitter"></i>
 			</a>
-			<a class="link-social link-facebook _blank" href="https://www.facebook.com/prestashop" title="Facebook">
+			<a class="link-social link-facebook _blank" href="https://www.facebook.com/qloapps" title="Facebook">
 				<i class="icon-facebook"></i>
 			</a>
-			<a class="link-social link-github _blank" href="https://www.prestashop.com/github" title="Github">
+			<a class="link-social link-github _blank" href="https://github.com/webkul/hotelcommerce" title="Github">
 				<i class="icon-github"></i>
 			</a>
-			<a class="link-social link-google _blank" href="https://plus.google.com/+prestashop/" title="Google">
+			<a class="link-social link-google _blank" href="https://plus.google.com/110221570427070809661" title="Google">
 				<i class="icon-google-plus"></i>
 			</a>
 		</p>

admin/themes/default/template/controllers/orders/_new_product.tpl

@@ -69,15 +69,15 @@
 			<div class="row">
 				<div class="input-group fixed-width-xl">
 					{if $currency->format % 2}<div class="input-group-addon">{$currency->sign} {l s='tax excl.'}</div>{/if}
-					<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
+					<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" readonly="true" />
 					{if !($currency->format % 2)}<div class="input-group-addon">{$currency->sign} {l s='tax excl.'}</div>{/if}
 				</div>
 			</div>
 			<br/>
 			<div class="row">
 				<div class="input-group fixed-width-xl">
 					{if $currency->format % 2}<div class="input-group-addon">{$currency->sign} {l s='tax incl.'}</div>{/if}
-					<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" disabled="disabled" />
+					<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" readonly="true" />
 					{if !($currency->format % 2)}<div class="input-group-addon">{$currency->sign} {l s='tax incl.'}</div>{/if}
 				</div>
 			</div>

admin/themes/default/template/controllers/orders/_product_line.tpl

@@ -59,6 +59,14 @@
 		{/if}
 	</td>
 	</td>
+	<td class="text-center">
+		<span class="product_original_price {if $data.feature_price_diff > 0}room_type_old_price{/if}" {if $data.feature_price_diff < 0} style="display:none;"{/if}>
+        	{convertPriceWithCurrency price=$data.unit_price_without_reduction_tax_incl currency=$currency->id}
+		</span>&nbsp;
+        <span class="room_type_current_price" {if !$data.feature_price_diff}style="display:none;"{/if}>	
+			{convertPriceWithCurrency price=$data.paid_unit_price_tax_incl currency=$currency->id}
+        </span>
+	</td>
 	<td class="text-center">
 		<span class="product_price_show">{convertPriceWithCurrency price=$data.amt_with_qty_tax_incl currency=$currency->id}</span>
 		{if $can_edit}
@@ -67,15 +75,15 @@
 				<div class="fixed-width-xl">
 					<div class="input-group">
 						{if $currency->format % 2}<div class="input-group-addon">{$currency->sign} {l s='tax excl.'}</div>{/if}
-						<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($data.unit_amt_tax_excl, 2)}"/>
+						<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($data.original_unit_price_tax_excl, 2)}"/>
 						{if !($currency->format % 2)}<div class="input-group-addon">{$currency->sign} {l s='tax excl.'}</div>{/if}
 					</div>
 				</div>
 				<br/>
 				<div class="fixed-width-xl">
 					<div class="input-group">
 						{if $currency->format % 2}<div class="input-group-addon">{$currency->sign} {l s='tax incl.'}</div>{/if}
-						<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($data.unit_amt_tax_incl, 2)}"/>
+						<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($data.original_unit_price_tax_incl, 2)}"/>
 						{if !($currency->format % 2)}<div class="input-group-addon">{$currency->sign} {l s='tax incl.'}</div>{/if}
 					</div>
 				</div>
@@ -110,7 +118,7 @@
 		{if $data['stage_name'] == 'Refunded' || $data['stage_name'] == 'Rejected'}
 			<p class="text-center">----</p>
 		{else}
-			<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mySwappigModal" data-id_order="{$order->id}" data-room_num={$data['room_num']} data-date_from={$data['date_from']} data-date_to={$data['date_to']} data-id_room={$data['id_room']} data-cust_name="{$data['alloted_cust_name']}" data-cust_email="{$data['alloted_cust_email']}" data-avail_rm_swap={$data['avail_rooms_to_swap']|@json_encode} data-avail_rm_realloc={$data['avail_rooms_to_realloc']|@json_encode}>
+			<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mySwappigModal" data-id_order="{$order->id}" data-room_num='{$data.room_num}' data-date_from='{$data.date_from}' data-date_to='{$data.date_to}' data-id_room='{$data.id_room}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_rm_realloc='{$data.avail_rooms_to_realloc|@json_encode}'>
 				{l s='Reallocate Room' mod='hotelreservationsystem'}
 			</button>
 		{/if}
@@ -161,3 +169,10 @@
 		</td>
 	{/if}
 </tr>
+	<style type="text/css">
+		.room_type_old_price {
+			text-decoration: line-through;
+			color:#979797;
+			font-size:12px; 
+		}
+	</style>

admin/themes/default/template/controllers/orders/current_cart_details_data.tpl

@@ -12,6 +12,7 @@
 							<th><span class="title_box">{l s='Room Image'}</th>
 							<th><span class="title_box">{l s='Room Type'}</span></th>
 							<th><span class="title_box">{l s='Duration'}</span></th>
+							<th><span class="title_box">{l s='Unit Price'}</span></th>
 							<th><span class="title_box">{l s='Price'}</span></th>
 							<th><span class="title_box">{l s='Action'}</span></th>
 						</tr>
@@ -25,6 +26,14 @@
 								<td><img src="{$data.image_link}" title="Room image" /></td>
 								<td>{$data.room_type}</td>
 								<td>{$data.date_from|date_format:"%d-%m-%Y"}&nbsp-&nbsp {$data.date_to|date_format:"%d-%m-%Y"}</td>
+								<td id="cart_detail_data_unit_price_{$data.id}">
+									<span class="product_original_price {if $data.feature_price_diff > 0}room_type_old_price{/if}" {if $data.feature_price_diff < 0} style="display:none;"{/if}>
+			                        	{displayPrice price=$data.product_price}
+									</span>&nbsp;
+			                        <span class="room_type_current_price" {if !$data.feature_price_diff}style="display:none;"{/if}>	
+										{displayPrice price=$data.feature_price}
+			                        </span>
+								</td>
 								<td id="cart_detail_data_price_{$data.id}">{displayPrice price=$data.amt_with_qty}</td>
 								<td>
 									<button class="btn btn-primary delete_hotel_cart_data" data-id_room={$data.id_room} data-id_product={$data.id_product} data-id = {$data.id} data-id_cart = {$data.id_cart} data-date_to = {$data.date_to} data-date_from = {$data.date_from}><i class="icon-trash"></i>&nbsp{l s='Delete'}</button>
@@ -40,4 +49,12 @@
 				</table>
 			</div>
 		</div>
-	</div>
+	</div>
+
+	<style type="text/css">
+		.room_type_old_price {
+			  text-decoration: line-through;
+			  color:#979797;
+			  font-size:12px; 
+			}
+	</style>