Merge branch 'Qloapps:develop' into gli-2560

Author: shazar-webkul

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

@@ -32,9 +32,7 @@
 					{if isset($selectedRoomDemands) && $selectedRoomDemands}
 						<li role="presentation" class="active"><a href="#room_type_demands_desc" aria-controls="facilities" role="tab" data-toggle="tab">{l s='Facilities'}</a></li>
 					{/if}
-					{if isset($serviceProducts) && $serviceProducts}
-						<li role="presentation" {if !isset($selectedRoomDemands) || !$selectedRoomDemands}class="active"{/if}><a href="#room_type_service_product_desc" aria-controls="services" role="tab" data-toggle="tab">{l s='Services'}</a></li>
-					{/if}
+					<li role="presentation" {if !isset($selectedRoomDemands) || !$selectedRoomDemands}class="active"{/if}><a href="#room_type_service_product_desc" aria-controls="services" role="tab" data-toggle="tab">{l s='Services'}</a></li>
 				</ul>
 				<div class="tab-content">
 					{if isset($selectedRoomDemands) && $selectedRoomDemands}

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

@@ -1572,6 +1572,7 @@
 					id_room: idRoom,
 					id_cart: idCart,
 					id_product: idProduct,
+					id_customer: id_customer,
 					id_hotel_cart_booking: idHotelCartBooking,
 					action: 'getRoomTypeCartDemands',
 					ajax: true
@@ -1877,7 +1878,7 @@
             <i class="icon-user"></i>
             {l s='Customer'}
         </div>
-        <div id="search-customer-form-group" class="form-group">
+        <div id="search-customer-form-group" {if isset($cart->id_customer) && $cart->id_customer &&  isset($customer) && $customer }style="display:none;"{/if} class="form-group">
             <label class="control-label col-lg-3">
                 <span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search for an existing customer by typing the first letters of his/her name.'}">
                     {l s='Search for a customer'}
@@ -1904,7 +1905,26 @@
             </div>
         </div>
         <div class="row">
-            <div id="customers"></div>
+            <div id="customers">
+			 	{if isset($cart->id_customer) && $cart->id_customer && isset($customer) && $customer }
+					<div class="customerCard col-lg-4 selected-customer">
+						<div class="panel">
+							<div class="panel-heading">
+							<i class="icon-ok text-success"></i>{$customer->firstname} {$customer->lastname} <span class="pull-right">#{$customer->id}</span>
+							</div>
+							<span>{$customer->email}</span><br>
+							<span class="text-muted"></span><br>
+							<div class="panel-footer">
+							<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer&liteDisplaying=1" class="btn btn-default fancybox">
+								<i class="icon-search"></i> Details </a>
+								<button type="button" data-id_cart="6" data-customer="2" class="btn btn-default pull-right change-customer">
+									<i class="icon-refresh"></i>&nbsp;Change 
+								</button>
+							</div>
+						</div>
+					</div>
+				{/if}
+			</div>
         </div>
         {*<div id="carts">
             <button type="button" id="show_old_carts" class="btn btn-default pull-right" data-toggle="collapse" data-target="#old_carts_orders">
@@ -1962,7 +1982,7 @@
     </div>
 	{include file='controllers/orders/_current_cart_details_data.tpl'}
 
-    <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;addorder=1&amp;cart_id={$cart->id}" method="post" style="display:none" id="cart_detail_form">
+    <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;addorder=1&amp;cart_id={$cart->id}" method="post" {if !isset($customer) && !$customer }style="display:none;"{/if} id="cart_detail_form">
         <div class="panel" id="products_part" style="display:none;">
             <div class="panel-heading">
                 <i class="icon-shopping-cart"></i>

classes/CartRule.php

@@ -1477,10 +1477,7 @@ public static function autoAddToCart(?Context $context = null)
      */
     public static function isFeatureActive()
     {
-        static $is_feature_active = null;
-        if ($is_feature_active === null) {
-            $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
-        }
+        $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
         return $is_feature_active;
     }
 

classes/Profile.php

@@ -141,11 +141,18 @@ public static function getProfileAccesses($id_profile, $type = 'id_tab')
                     );
                 }
             } else {
-                $result = Db::getInstance()->executeS('
-				SELECT *
-				FROM `'._DB_PREFIX_.'access` a
-				LEFT JOIN `'._DB_PREFIX_.'tab` t ON t.id_tab = a.id_tab
-				WHERE `id_profile` = '.(int)$id_profile);
+                if ($result = Db::getInstance()->executeS('
+                    SELECT * FROM `'._DB_PREFIX_.'access` a
+                    LEFT JOIN `'._DB_PREFIX_.'tab` t ON t.id_tab = a.id_tab
+                    WHERE `id_profile` = '.(int)$id_profile)
+                ) {
+                    foreach ($result as $key => $profileAccess) {
+                        $result[$key]['view'] = (int) $profileAccess['view'];
+                        $result[$key]['delete'] = (int) $profileAccess['delete'];
+                        $result[$key]['add'] = (int) $profileAccess['add'];
+                        $result[$key]['edit'] = (int) $profileAccess['edit'];
+                    }
+                }
 
                 foreach ($result as $row) {
                     self::$_cache_accesses[$id_profile][$type][$row[$type]] = $row;

classes/Tools.php

@@ -2608,29 +2608,26 @@ public static function generateIndex()
     public static function getDefaultIndexContent()
     {
         return '<?php
-/**
-* 2007-'.date('Y').' PrestaShop
-*
+/*
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
+* 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:
-* http://opensource.org/licenses/osl-3.0.php
+* 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 license@prestashop.com so we can send you a copy immediately.
+* 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 PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
+* 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    PrestaShop SA <contact@prestashop.com>
-*  @copyright 2007-'.date('Y').' PrestaShop SA
-*  @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
+* @author Webkul IN
+* @copyright Since 2010 Webkul
+* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 */
 
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");

classes/cache/CacheFs.php

@@ -37,7 +37,8 @@ protected function __construct()
 
         $keys_filename = $this->getFilename(self::KEYS_NAME);
         if (@filemtime($keys_filename)) {
-            $this->keys = unserialize(file_get_contents($keys_filename));
+            $keys = @unserialize(file_get_contents($keys_filename));
+            $this->keys = is_array($keys) ? $keys : array();
         }
     }
 

classes/controller/AdminController.php

@@ -886,7 +886,7 @@ public function processFilter()
                 }
 
                 if (is_array($value)) {
-                    if ($value[0] === '' && $value[1] === '') {
+                    if (isset($value[0], $value[1]) && $value[0] === '' && $value[1] === '') {
                         $value = '';
                     } else {
                         $value = json_encode($value);
@@ -915,7 +915,7 @@ public function processFilter()
                 }
 
                 if (is_array($value)) {
-                    if ($value[0] === '' && $value[1] === '') {
+                    if (isset($value[0], $value[1]) && $value[0] === '' && $value[1] === '') {
                         $value = '';
                     } else {
                         $value = json_encode($value);

classes/webservice/WebserviceSpecificManagementBookings.php

@@ -507,7 +507,7 @@ public function formatRoomInRequestData($data)
                 $formattedRooms[$key]['occupancy'] = $occupancy;
                 if (isset($room['id_tax_rules_group'])) {
                     $formattedRooms[$key]['id_tax_rules_group'] = $room['id_tax_rules_group'];
-                } else if ($room['total_tax']) {
+                } else if (isset($room['total_tax'])) {
                     $formattedRooms[$key]['total_tax'] = $room['total_tax'];
                 }
             }

controllers/admin/AdminImportController.php

@@ -3223,7 +3223,25 @@ public function supplyOrdersDetailsImport()
 
     public function utf8EncodeArray($array)
     {
-        return (is_array($array) ? array_map('utf8_encode', $array) : mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1'));
+        if (is_array($array)) {
+            return array_map(function ($value) {
+                if (is_array($value)) {
+                    return $this->utf8EncodeArray($value);
+                }
+
+                if (!is_string($value)) {
+                    return $value;
+                }
+
+                return mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
+            }, $array);
+        }
+
+        if (!is_string($array)) {
+            return $array;
+        }
+
+        return mb_convert_encoding($array, 'UTF-8', 'ISO-8859-1');
     }
 
     protected function getNbrColumn($handle, $glue)

controllers/admin/AdminOrdersController.php

@@ -485,6 +485,7 @@ public function renderForm()
                     'advance_payment_amount_without_tax' => $cart->getOrderTotal(false, Cart::ADVANCE_PAYMENT),
                     'advance_payment_amount_with_tax' => $cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT),
                     'cart' => $cart,
+                    'customer' => $cart->id_customer ? new Customer($cart->id_customer): null ,
                     'currencies' => Currency::getCurrenciesByIdShop(Context::getContext()->shop->id),
                     'langs' => Language::getLanguages(true, Context::getContext()->shop->id),
                     'payment_modules' => $payment_modules,
@@ -3593,10 +3594,11 @@ public function renderView()
                 }
             }
 
-            $messages = array_merge($customerMessages, $messages);
-            usort($messages, function ($a, $b) {
-                return strtotime($a['date_add']) < strtotime($b['date_add']);
-            });
+            if($messages = array_merge($customerMessages, $messages)){
+                usort($messages, function ($a, $b) {
+                    return (strtotime($a['date_add']) < strtotime($b['date_add'])) ? 1 : -1;
+                });
+            }
         }
 
         // send hotel standalone and standalone products
@@ -7489,7 +7491,7 @@ public function ajaxProcessUpdateSelectedRoomServices()
                                 $response['hasError'] = true;
                                 $response['errors'][] = Tools::displayError('Invalid quantity provided for service').': '.$objServiceProductOrderDetail->name;
                             }
-                        } elseif ($serviceQuantities[$idRoomTypeServiceProductOrderDetail] > 1) {
+                        } elseif (is_array($serviceQuantities) && isset($serviceQuantities[$idRoomTypeServiceProductOrderDetail]) && $serviceQuantities[$idRoomTypeServiceProductOrderDetail] > 1) {
                             $response['hasError'] = true;
                             $response['errors'][] = Tools::displayError('Can not order multiple quanitity for service').': '.$objServiceProductOrderDetail->name;
                         }
@@ -7510,7 +7512,11 @@ public function ajaxProcessUpdateSelectedRoomServices()
                     $result = true;
                     foreach ($selectedServicesOrderDetails as $idRoomTypeServiceProductOrderDetail) {
                         $objServiceProductOrderDetail = new ServiceProductOrderDetail($idRoomTypeServiceProductOrderDetail);
-                        $quantity = $serviceQuantities[$idRoomTypeServiceProductOrderDetail];
+                        if(is_array($serviceQuantities) && isset($serviceQuantities[$idRoomTypeServiceProductOrderDetail])) {
+                            $quantity = (int)$serviceQuantities[$idRoomTypeServiceProductOrderDetail];
+                        } else {
+                            $quantity = 1;
+                        }
                         $unitPrice = $serviceUnitPrices[$idRoomTypeServiceProductOrderDetail];
 
                         $objHotelBookingDetail = new HotelBookingDetail($objServiceProductOrderDetail->id_htl_booking_detail);