Merge branch develop into '1.5.x'

Releasing QloApps v1.5.1: Merge pull request #234 from webkul/develop

Author: rohit053

Adapter/Adapter_EntityMapper.php

@@ -59,6 +59,7 @@ public function load($id, $id_lang, $entity, $entity_defs, $id_shop, $should_cac
             }
 
             if ($object_datas = Db::getInstance()->getRow($sql)) {
+				$objectVars = get_object_vars($entity);
                 if (!$id_lang && isset($entity_defs['multilang']) && $entity_defs['multilang']) {
                     $sql = 'SELECT *
 							FROM `' . bqSQL(_DB_PREFIX_ . $entity_defs['table']) . '_lang`
@@ -68,7 +69,7 @@ public function load($id, $id_lang, $entity, $entity_defs, $id_shop, $should_cac
                     if ($object_datas_lang = Db::getInstance()->executeS($sql)) {
                         foreach ($object_datas_lang as $row) {
                             foreach ($row as $key => $value) {
-                                if ($key != $entity_defs['primary'] && array_key_exists($key, $entity)) {
+								if ($key != $entity_defs['primary'] && array_key_exists($key, $objectVars)) {
                                     if (!isset($object_datas[$key]) || !is_array($object_datas[$key])) {
                                         $object_datas[$key] = array();
                                     }
@@ -81,7 +82,9 @@ public function load($id, $id_lang, $entity, $entity_defs, $id_shop, $should_cac
                 }
                 $entity->id = (int)$id;
                 foreach ($object_datas as $key => $value) {
-                    if (array_key_exists($key, $entity)) {
+                    //if (array_key_exists($key, $entity)) {
+					if (array_key_exists($key, $entity_defs['fields'])
+						|| array_key_exists($key, $objectVars)) {
                         $entity->{$key} = $value;
                     } else {
                         unset($object_datas[$key]);

CHANGELOG.txt

@@ -1,3 +1,83 @@
+####################################
+# V1.5.1
+####################################
+
+## Added Features:
+
+[+] CO : [#217] `auto_generated` column in `address` table added to track address creation source
+[+] CO : [#207] New order states 'Partial payment accepted' and 'Awaiting partial payment' added for the partial payment
+[+] CO : [#208] "Catalog Mode" option to disable all booking options, customer can only view Rooms
+[+] CO : [#198, #226] Multiple hooks are added in the different QloApps core files
+
+[+] FO : [#187] Display voucher name along with voucher code on order page
+
+## Improved/changed features:
+
+[*] BO : [#206] Removed Other Modules setting from admin Hotel Reservation System -> Settings
+[*] BO : [#200] Removed shipping option from car rule condition.
+[*] BO : [#199] Removed "Display suppliers and manufacturers" and "Display best sellers" options from Admin Preferences controller
+[*] BO : [#193] Removed Payment Modules setting from admin Hotel Reservation System -> Settings
+[*] BO : [#189] Moved hotel selection from configuration tab to information tab
+[*] BO : [#179] Added hotel column in room type feature pricing list
+[*] BO : [#177] Removed multishop option
+[*] BO : [#149] Removed carrier column from Booking Carts Controller
+[*] BO : [#183] Added hotel name along with room name when adding filter of room type for cart rule
+[*] BO : [#204, #196, #182] Text Changes
+[*] BO : [#110, #111] Code Optimization
+
+[*] CO : [#223] getHotelCartBookingData() : function multiplication optimized
+[*] CO : [#225] HotelRoomTypeFeaturePricing.php optimized (Removed unused variables, removed static values assigned)
+[*] CO : [#218] Added hotel name column in order confirmation mail and invoice.
+[*] CO : [#210] CMS page Delivery is not valid for hotel industry. So changed it to Policies page
+[*] CO : [#205] Prevent deleting profile which is used by at least one employee
+[*] CO : [#214] blockcart module :: Removed unused hooks displayLeftColumn and displayrightColumn
+[*] CO : [#180] license file name changed from LICENSES to LICENSE
+[*] CO : [#181] Readme file improvements with more information and links
+[*] CO : [#221] dataforfrontsearch() function now calculate and provide "feature_price_diff" value in response
+[*] CO : [#175] Changed QloApps versioning system (now 1.5.0.0 please check)
+[*] CO : [#175] Updated module compatibility check with QloApps version
+[*] CO : [#215] "hotelreservationsystem.php" code optimization in hook "actionValidateOrder"
+[*] CO : [#117, #118, #119, #120, #121, #122, #134, #137, #138, #139] Changes for PHP7 compatibility
+[*] CO : [#178] Text Changes
+
+[*] FO : [#222] Disabled mobile keyboard pop up when using date-picker in home search
+[*] FO : [#208] Room type listing on search result page moved to different template "room_type_listing.tpl"
+[*] FO : [#185] Replaced star rating plugin with jquery Raty in Product Comments module
+[*] FO : [#156] "product.js" code multiplication optimized
+[*] FO : [#215] "ajax-cart.js" add validation
+[*] FO : [#125, #127, #141, #142] Changes for PHP7 compatibility
+
+
+## Bug/Issues Resolved:
+
+[-] BO : Fixed : [#211] Errors on cart rule page when add room type, which is not assigned to hotel, selected in room type condition
+[-] BO : Fixed : [#197] wrong theme information is displayed at Preferences -> Themes admin controller
+[-] BO : Fixed : [#195] Filter by position in the render lists of admin controllers
+[-] BO : Fixed : [#194] Entering wrong discount while Group creation, page redirects to list page
+[-] BO : Fixed : [#192] Using filter in customer Group list, page redirects to previous list
+[-] BO : Fixed : [#189] Room Type associations with its hotel parent category
+[-] BO : Fixed : [#176] Birthday input field width in Helper Form
+[-] BO : Fixed : [#173] Undefined varaible issue Manage Order Refund Request Controller
+[-] BO : Fixed : [#171] Multiple request on single click in Helper List
+[-] BO : Fixed : [#160] "Access Denied" issue when an employee other than super admin create a new room.
+[-] BO : Fixed : [#168] Room number not updating after room reallocation and swap
+[-] BO : Fixed : [#162] Additional facility price changes for room type after saving
+[-] BO : Fixed : [#147] Creating order status without entering "status name", page redirects to blank page
+[-] BO : Fixed : [#148] Creating order refund status without entering "status name", page redirects to list page
+[-] BO : Fixed : [#229] Resolved undefined variable error in Manage Order Refund Request Controller
+
+[-] FO : Fixed : [#212] Design issue of select in the ADDITIONAL FACILITIES if text exceeds from block in the product detail page
+[-] FO : Fixed : [#209] Errors on the search result page: If new group is created and only this group is assigned to the customer
+[-] FO : Fixed : [#203] Guest is unable to submit Refund Request again after entering invalid Refund Reason once
+[-] FO : Fixed : [#158] Hotel selection in search panel for mobile devices
+[-] FO : Fixed : [#169] Wrong price displayed when booking from 1 march to 30 march
+[-] FO : Fixed : [#151] Room search check-in && check-out don't change when friendly URL is disabled.
+
+[-] CO : Fixed : [#186] Links in mail for my-account, guest tracking and my orders pages are now localized to customer language.
+[-] CO : Fixed : [#109] updated invalid varaible "pshone_mobile" to "phone_mobile"
+[-] CO : Fixed : [#202] "global.css" added missing class for aligning images left and right in discription
+
+
 ####################################
 # V1.5.0
 ####################################

LICENSES LICENSELICENSES renamed to LICENSE

@@ -1,54 +1,91 @@
-QloApps
---------
-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
+<div align="center">
+	<a href="https://www.qloapps.com"><img src="https://forums.qloapps.com/assets/uploads/system/site-logo.png?v=hkl8e1230fo" alt="QloApps"></a>
+	<br>
+	<p>
+		<b>QloApps - An open source and free platform to launch your own hotel booking website</b>
+	</p>
+</div>
 
+<p align="center">
+	<a href="https://qloapps.com/download/"><img src="https://img.shields.io/badge/Download-Download%20QloApps%20-brightgreen" alt="Download"></a>
+	<a href="https://qloapps.com/qlo-reservation-system/"><img src="https://img.shields.io/badge/Documentation-Blog-yellowgreen" alt="Documentation"></a>
+	<a href="https://forums.qloapps.com/"><img src="https://img.shields.io/badge/Forum-Help%2FSupport-green" alt="Forum"></a>
+	<a href="https://qloapps.com/addons/"><img src="https://img.shields.io/badge/Addons-Plugins-blueviolet" alt="Addons"></a>
+	<a href="https://qloapps.com/contact/"><img src="https://img.shields.io/badge/Contact-Get%20In%20Touch-blue" alt="Contact us"></a>
+	<a href="https://github.com/webkul/hotelcommerce/blob/develop/LICENSE"><img src="https://img.shields.io/badge/License-OSL%20V3-green" alt="License"></a>
+</p>
 
-Demo
---------
-FrontEnd : http://demo.qloapps.com </br>
-Backend : http://demo.qloapps.com/adminhtl/index.php </br>
-username : demo@demo.com </br>
-Password : demodemo </br>
+## Topics
+1. [Introduction](#introduction)
+2. [Requirements](#requirements)
+3. [Installation & Configuration](#installation-and-configuration)
+4. [License](#license)
+5. [Security Vulnerabilities](#security-vulnerabilities)
+6. [Documentation & Demo](#documentation--demo)
+7. [Contribute](#contribute)
+8. [Credits](#credits)
 
 
-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)
-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.
+### Introduction
 
+QloApps also known as Qlo is an **Open-source and Free hotel reservation system** and booking engine. <br>
+With the help of QloApps, you can launch your hotel booking website without any cost and take & manage online bookings . You can manage your online & On-Desk booking easily with QloApps.
 
-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.
+### Requirements
 
-b) Docker Image :</br>
-https://github.com/webkul/qloapps_docker</br>
-https://hub.docker.com/r/webkul/qloapps_docker/ </br>
+In order to install QloApps you will need the following server configurations for hosted and local serves.
+The system compatibility will also be checked by the system with installation and if the server is not compatible then the installation will not move ahead.
 
-c) Vagrant Image :
-https://github.com/webkul/Vagrant_qloapps
+#### Hosted Server Configurations
 
+* **Web server**: Apache 1.3, Apache 2.x, Nginx or Microsoft IIS
+* **PHP  version**: 5.4+
+* **MySQL version**:  5.0+ and below 5.7 installed with a database created
+* SSH or FTP access (ask your hosting service for your credentials)
+* In the PHP configuration ask your provider to set memory_limit to "128M", upload_max_filesize to "16M" ,    max_execution_time to "500" and allow_url_fopen "on"
+* SSL certificate if you plan to process payments internally (not using PayPal for instance)
+* **Required PHP extensions**: cURL, SimpleXML, SOAP
 
-Getting support
---------
-If you need help using QloApps, contact the QloApps support team: qloapps@webkul.com
-or raise ticket at https://webkul.uvdesk.com
+#### Local Server Configurations
 
-Webkul is known for his proactive support and already developed more than 100+ plugins on prestashop and more than 700+ plugins on other platforms.
+* **Supported operating system**: Windows, Mac, and Linux
+* **A prepared package**: WampServer (for Windows), Xampp (for Windows and Mac) or EasyPHP (for Windows)
+* **Web server**: Apache 1.3, Apache 2.x, Nginx or Microsoft IIS
+* **PHP**: 5.4+ and below PHP 7.0
+* **MySQL** 5.0+ and below 5.7 installed with a database created
+* In the PHP configuration, set memory_limit to "128M", upload_max_filesize to "16M" and max_execution_time to "500"
+* **Required PHP extensions**: cURL, SimpleXML, SOAP
 
+### Installation and Configuration
 
-license
---------
-OSL V3 : https://opensource.org/licenses/OSL-3.0
+**1.** You can install QloApps easily after downloading QloApps. There are easy steps for the installation process. Please visit [QloApps Installation Guide](https://qloapps.com/install-qloapps/) and follow the steps for the successful installation.
 
+**2.** Or you can install QloApps with docker image. For the docker image of QloApps, please visit [Dockerize image of QloApps](https://hub.docker.com/r/webkul/qloapps_docker) <br>
+* Docker pull command
+~~~
+docker pull webkul/qloapps_docker
+~~~
 
-Credits
---------
-Crafted with :heart: at [Webkul](http://webkul.com)
+### License
 
+QloApps is a truly opensource Hotel-Commerce platform which is under the [Open Software License 3.0](https://github.com/webkul/hotelcommerce/blob/develop/LICENSE).
 
-Thank you for downloading.
+### Security Vulnerabilities
+
+Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in QloApps then please email us: mailto:support@qloapps.com.
+
+### Documentation & Demo
+
+#### QloApps Documentation [https://qloapps.com/qlo-reservation-system](https://qloapps.com/qlo-reservation-system)
+#### QloApps Demo
+**FrontEnd** : https://demo.qloapps.com </br>
+**Backend** : https://demo.qloapps.com/adminhtl/index.php </br>
+**username** : demo@demo.com </br>
+**Password** : demodemo </br>
+
+### Contribute
+As a PHP developer who has command on PHP and MySQL and also knows how to use Git or GitHub efficiently, can contribute to code enhancements via pull requests.<br>
+For more information about the contribution process please visit **[Contribute to QloApps](https://qloapps.com/how-to-contribute-to-qloapps-project/)**
+
+### Credits
+Crafted with :heart: at [Webkul](https://webkul.com)

README.md

@@ -202,7 +202,7 @@ function getDirContent($path)
     if (is_dir($path)) {
         $d = dir($path);
         while (false !== ($entry = $d->read())) {
-            if ($entry{0} != '.') {
+            if ($entry[0] != '.') {
                 $content[] = $entry;
             }
         }

admin/functions.php

@@ -53,10 +53,10 @@
 	</label>
 	<div class="col-lg-9">
 		<div class="row">
-			<div class="col-lg-3">
+			<div class="col-lg-4">
 				<input type="text" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
 			</div>
-			<div class="col-lg-2">
+			<div class="col-lg-4">
 				<select name="minimum_amount_currency">
 				{foreach from=$currencies item='currency'}
 					<option value="{$currency.id_currency|intval}"
@@ -70,18 +70,19 @@
 				{/foreach}
 				</select>
 			</div>
-			<div class="col-lg-3">
+			<div class="col-lg-4">
 				<select name="minimum_amount_tax">
 					<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
 					<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
 				</select>
 			</div>
-			<div class="col-lg-4">
+			<input type="hidden" name="minimum_amount_shipping" value="0">
+			{* <div class="col-lg-4">
 				<select name="minimum_amount_shipping">
 					<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
 					<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
 				</select>
-			</div>
+			</div> *}
 		</div>
 	</div>
 </div>

admin/themes/default/template/controllers/cart_rules/conditions.tpl

@@ -34,7 +34,7 @@
 	var currentIndexWithToken = '{$currentIndex|escape:'html':'UTF-8'}&token={$token|escape:'html':'UTF-8'}';
 	var dirNameCurrentIndex = '{$dirNameCurrentIndex}';
 	var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
-	var installed_modules = {if isset($installed_modules) && count($installed_modules)}{$installed_modules}{else}false{/if};
+	var installed_modules = {if isset($installed_modules) && is_array($installed_modules) && count($installed_modules)}{$installed_modules}{else}false{/if};
 	var by = '{l s='by'}';
 	var confirmPreferencesSaved = '{l s='Preferences saved'}';
 	{if isset($smarty.get.anchor) && !isset($error_module)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}