diff --git a/admin/themes/default/sass/partials/_content.sass b/admin/themes/default/sass/partials/_content.sass index e86c5bd65..02f828538 100644 --- a/admin/themes/default/sass/partials/_content.sass +++ b/admin/themes/default/sass/partials/_content.sass @@ -191,6 +191,84 @@ body.display-modal margin: 15px 0 0!important height: 40px!important +//list header +.list_action_wrapper + margin-bottom: 15px + .list_availibility_container + position: relative + .dropdown-menu + right: 0 + padding: 8px 12px + label + font-weight: 400 + #selected_filter_container + background-color: #fff + padding: 8px 20px + border: solid 1px #d3d8db + border-radius: 5px 5px 0 0 + font-size: 14px + min-height: 52px + margin-top: 15px + .selected_filters > span + font-size: 12px + padding: 6px 10px + display: inline-block + background: #F5F8F9 + border: 1px solid #A0D0EB + border-radius: 3px + &+ span + margin-left: 12px + .filter_value + font-weight: 700 + i + cursor: pointer + + #list_filters_panel + margin-top: 15px + margin-bottom: 0 + #selected_filter_container + #list_filters_panel + margin-top: 0 + #selected_filter_container + div.panel + border-top: transparent + border-radius: 0 0 5px 5px + .list_filters + padding: 0 30px + display: grid + grid-template-columns: repeat(3, minmax(0, 1fr)) + gap: 8px 40px + &>.row + display: flex + align-items: center + .date_range, .input_range + display: flex + justify-content: space-between + gap: 15px + .date_range .input-group:first-child + margin-bottom: 0 + label + text-align: right + font-weight: 400 + .actions + grid-column-start: 1 + grid-column-end: 4 + @media (max-width: $screen-desktop) + .list_filters + grid-template-columns: repeat(2, 1fr) + .actions + grid-column-start: 1 + grid-column-end: 3 + + @media (max-width: $screen-tablet) + .list_filters + grid-template-columns: repeat(1, 1fr) + .actions + grid-column-start: 1 + grid-column-end: 2 + label + text-align: left + + + //help containers #main.helpOpen width: 70% diff --git a/admin/themes/default/template/controllers/normal_products/helpers/list/index.php b/admin/themes/default/template/controllers/normal_products/helpers/list/index.php deleted file mode 100644 index 2cba03ab6..000000000 --- a/admin/themes/default/template/controllers/normal_products/helpers/list/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../../../../../../../../'); -exit; diff --git a/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl deleted file mode 100644 index 27872f854..000000000 --- a/admin/themes/default/template/controllers/normal_products/helpers/list/list_header.tpl +++ /dev/null @@ -1,36 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-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. -* -* 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. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{extends file="helpers/list/list_header.tpl"} - -{block name=leadin} - {if isset($category_tree)} -
-
- {$category_tree} -
-
- {/if} -{/block} diff --git a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl index 255b57976..c4365c90f 100644 --- a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl @@ -65,446 +65,91 @@ {/if} {/block} - - -{block name="tableFilter"}{/block} {block name="override_form_extra"} - {if !$simple_header && $show_filters} - -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- {if $filters_has_value} -
- {l s='Filters: '} - - {foreach $fields_display AS $key => $params} - {if (!isset($params.search) || $params.search) && $params.value != ''} - {if ($params.type == 'date' || $params.type == 'datetime' || $params.type == 'range') && $params.value|is_array} - {assign var="filter_value" value=''} - {foreach $params.value as $value} - {if (isset($value) && ($value !== '' || $value === 0))} - {if !(isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - {assign var="filter_value" value=$value} - {else} - {assign var="filter_value" value="`$filter_value` - `$value`"} - {/if} - {/if} - {/foreach} - {if (isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - - {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} - - - {/if} - {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {$params['title']|escape:'html':'UTF-8'}: - - {foreach from=$params.value item=option name=foreachInfo} - {$params.list[$option]}{if !$smarty.foreach.foreachInfo.last}{if $params.operator == 'or'} | {else}, {/if}{/if} - {/foreach} - - - - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|replace: ' ' : ''} - - - {/if} - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} - - - {/if} - {/if} - {/foreach} - -
- {/if} -
-
-
-
- {foreach $fields_display AS $key => $params} - {if !isset($params.search) || $params.search} -
- -
- {if $params.type == 'range'} -
- - -
- {elseif $params.type == 'bool'} - - {elseif $params.type == 'date' || $params.type == 'datetime'} -
-
- - - - - -
-
- - - - - -
- -
- {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {else} - {if isset($params.filter_key)} - - {/if} - {/if} - {else} - - {/if} -
-
- {/if} - {/foreach} - {if $has_actions || $show_filters} -
-
- {if $show_filters} - - - {if $filters_has_value} - - {/if} - - {/if} -
- {/if} -
-
-
-
-
-
-
- - {/if} {/block} diff --git a/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl deleted file mode 100644 index 6801fde31..000000000 --- a/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl +++ /dev/null @@ -1,417 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-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. -* -* 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. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{extends file="helpers/list/list_header.tpl"} - -{block name="tableFilter"}{/block} -{block name="override_form_extra"} - {if !$simple_header && $show_filters} - -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- {if $filters_has_value} -
- {l s='Filters: '} - - {foreach $fields_display AS $key => $params} - {if (!isset($params.search) || $params.search) && $params.value != ''} - {if ($params.type == 'date' || $params.type == 'datetime') && $params.value|is_array} - {assign var="filter_value" value=''} - {foreach $params.value as $value} - {if ($value|is_string && !empty($value))} - {if empty($filter_value)} - {assign var="filter_value" value=$value} - {else} - {assign var="filter_value" value="`$filter_value` - `$value`"} - {/if} - {/if} - {/foreach} - {if !empty($filter_value)} - - {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} - - - {/if} - {elseif $params.type == 'range' && $params.value|is_array} - {assign var="filter_value" value=''} - {foreach $params.value as $value} - {if (isset($value) && ($value !== '' || $value === 0))} - {if !(isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - {assign var="filter_value" value=$value} - {else} - {assign var="filter_value" value="`$filter_value` - `$value`"} - {/if} - {/if} - {/foreach} - {if (isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} - - {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} - - - {/if} - {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {$params['title']|escape:'html':'UTF-8'}: - - {foreach from=$params.value item=option name=foreachInfo} - {$params.list[$option]}{if !$smarty.foreach.foreachInfo.last}{if $params.operator == 'or'} | {else}, {/if}{/if} - {/foreach} - - - - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|replace: ' ' : ''} - - - {/if} - {elseif $params.type == 'bool' && $key == 'advance_payment'} - - {$params['title']|escape:'html':'UTF-8'}: {if $params['value'] == 1}{l s='Yes'}{elseif $params['value'] == 0}{l s='No'}{/if} - - - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} - - - {/if} - {/if} - {/foreach} - -
- {/if} -
-
-
-
- {foreach $fields_display AS $key => $params} - {if !isset($params.search) || $params.search} -
- -
- {if $params.type == 'range'} -
- - -
- {else if $params.type == 'bool'} - - {elseif $params.type == 'date' || $params.type == 'datetime'} -
-
- - - - - -
-
- - - - - -
- -
- {elseif $params.type == 'select'} - {if isset($params.multiple) && $params.multiple} - - {else} - {if isset($params.filter_key)} - - {/if} - {/if} - {else} - - {/if} -
-
- {/if} - {/foreach} - {if $has_actions || $show_filters} -
-
- {if $show_filters} - - - {if $filters_has_value} - - {/if} - - {/if} -
- {/if} -
-
-
-
-
-
-
- - - {/if} -{/block} \ No newline at end of file diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl index a03584068..bf7678e4f 100644 --- a/admin/themes/default/template/helpers/list/list_header.tpl +++ b/admin/themes/default/template/helpers/list/list_header.tpl @@ -75,8 +75,8 @@ $('#submitFilter{$list_id}').val(1); }); - if ($("table .datepicker").length > 0) { - $("table .datepicker").datepicker({ + if ($("form .datepicker").length > 0) { + $("form .datepicker").datepicker({ prevText: '', nextText: '', altFormat: 'yy-mm-dd' @@ -121,7 +121,305 @@ {block name="override_form_extra"}{/block} -
+ {if !$simple_header && $show_filters} + + {/if} + {block name="updatelist"} + {if $new_list_header_design} +
+
+ {if $fields_optional|count} +
+
+ + +
+
+ {/if} + {if !$simple_header && $show_filters} +
+
+ +
+
+ {/if} +
+
+
+ {if $filters_has_value} +
+ {l s='Filters: '} + + {foreach $fields_display AS $key => $params} + {if (!isset($params.search) || $params.search) && $params.value != ''} + {if ($params.type == 'date' || $params.type == 'datetime' || $params.type == 'range') && $params.value|is_array} + {assign var="filter_value" value=''} + {foreach $params.value as $value} + {if (isset($value) && ($value !== '' || $value === 0))} + {if !(isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} + {assign var="filter_value" value=$value} + {else} + {assign var="filter_value" value="`$filter_value` - `$value`"} + {/if} + {/if} + {/foreach} + {if (isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} + + {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} + + + {/if} + {elseif $params.type == 'select'} + {if isset($params.multiple) && $params.multiple} + + {$params['title']|escape:'html':'UTF-8'}: + + {foreach from=$params.value item=option name=foreachInfo} + {$params.list[$option]}{if !$smarty.foreach.foreachInfo.last}{if $params.operator == 'or'} | {else}, {/if}{/if} + {/foreach} + + + + {else} + + {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|replace: ' ' : ''} + + + {/if} + {elseif $params.type == 'bool'} + + {$params['title']|escape:'html':'UTF-8'}: {if $params['value'] == 1}{l s='Yes'}{else}{l s='No'}{/if} + + + {else} + + {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} + + + {/if} + {/if} + {/foreach} + +
+ {/if} +
+
+
+
+ {foreach $fields_display AS $key => $params} + {if !isset($params.search) || $params.search} +
+ +
+ {if $params.type == 'range'} +
+ + +
+ {elseif $params.type == 'bool'} + + {elseif $params.type == 'date' || $params.type == 'datetime'} +
+
+ + + + + +
+
+ + + + + +
+ +
+ {elseif $params.type == 'select'} + {if isset($params.multiple) && $params.multiple} + + {else} + {if isset($params.filter_key)} + + {/if} + {/if} + {else} + + {/if} +
+
+ {/if} + {/foreach} + {if $has_actions || $show_filters} +
+
+ {if $show_filters} + + + {if $filters_has_value} + + {/if} + + {/if} +
+ {/if} +
+
+
+
+
+
+
+ {/if} + {/block} +
{block name="panel_heading"} {elseif $params.type == 'select'} {if isset($params.filter_key)} - {if isset($params.list) && is_array($params.list)} {foreach $params.list AS $option_value => $option_display} diff --git a/classes/Cart.php b/classes/Cart.php index 921afd2cf..7500dd21e 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -2407,7 +2407,8 @@ class CartCore extends ObjectModel $product['cart_quantity'] = $selectedProduct['quantity']; $product['total'] = $selectedProduct['total_price_tax_excl']; $product['total_wt'] = $selectedProduct['total_price_tax_incl']; - $product['price_wt'] = $selectedProduct['unit_price_tax_incl']; + $product['price_wt'] = $selectedProduct['total_price_tax_incl'] / $product['cart_quantity']; + $product['price'] = $selectedProduct['total_price_tax_excl'] / $product['cart_quantity']; $product['id_hotel'] = $selectedProduct['id_hotel']; $orderPackage[$id_address][$selectedProduct['id_hotel']]['product_list'][] = $product; if (!isset($orderPackage[$id_address][$selectedProduct['id_hotel']]['id_hotel'])) { diff --git a/classes/Tools.php b/classes/Tools.php index 50b9cdf23..b58175fab 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -3437,14 +3437,9 @@ exit; $post_data .= '&method=listing&action=install-modules'; $post_data .= defined('_PS_HOST_MODE_') ? '-od' : ''; break; - case 'catalog-recommendation': - $protocols[] = 'http'; - $post_data .= '&method=content&action=catalogRecommendation'; - $post_data .= defined('_PS_HOST_MODE_') ? '-od' : ''; - break; - case 'dashboard-recommendation': - $protocols[] = 'http'; - $post_data .= '&method=content&action=dashboardRecommendation'; + case 'recommendation': + $post_data .= '&method=recommendation&controller='; + $post_data .= (isset($params['controller']) ? $params['controller'] : Context::getContext()->controller->controller_name); $post_data .= defined('_PS_HOST_MODE_') ? '-od' : ''; break; case 'check-version': diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 9ee0ef05e..6d36f953e 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -197,6 +197,9 @@ class AdminControllerCore extends Controller /** @var string */ protected $_filterHaving; + /** @var string */ + protected $_new_list_header_design = false; + /** @var array Temporary SQL table WHERE clause determined by filter fields */ protected $_tmpTableFilter = ''; @@ -406,6 +409,9 @@ class AdminControllerCore extends Controller const QLO_SEARCH_TYPE_MODULE = 7; const QLO_SEARCH_TYPE_HOTEL = 8; + /** @var string path for recomendation content */ + const RECOMMENDATION_CONTENT_FILE_PATH = ''; + public function __construct() { global $timer_start; @@ -2511,6 +2517,7 @@ class AdminControllerCore extends Controller } $this->setHelperDisplay($helper); + $helper->_new_list_header_design = $this->_new_list_header_design; $helper->_default_pagination = $this->_default_pagination; $helper->_pagination = $this->_pagination; $helper->tpl_vars = $this->getTemplateListVars(); @@ -3985,17 +3992,65 @@ class AdminControllerCore extends Controller public function ajaxProcessGetRecommendationContent() { $response = array('success' => false); - if (isset($this->context->cookie->{$this->controller_name.'_closed'}) && $this->context->cookie->{$this->controller_name.'_closed'}) { - $response['success'] = true; - } else { - if (method_exists($this, 'getRecommendationContent')) { - if ($content = $this->getRecommendationContent()) { - $response['success'] = true; - $response['content'] = $content; + if ($this->context->controller->getRecommendationFilePath()) { + $response = $this->getRecommendationContent(); + } + $this->context->cookie->write(); + $this->ajaxDie(json_encode($response)); + } + + public function getRecommendationContent() + { + $content = array( + 'success' => false, + 'cache' => true, + 'html' => '' + ); + + if ($recommendationContent = $this->updateRecommendationContent()) { + $content['cache'] = false; + } + if (file_exists(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath())) { + $content['success'] = true; + if (!isset($this->context->cookie->{$this->controller_name.'_closed'}) || !$this->context->cookie->{$this->controller_name.'_closed'}) { + $content['html'] = file_get_contents(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath()); + } + } + + return $content; + } + + public function updateRecommendationContent() + { + if (!Tools::isFresh($this->context->controller->getRecommendationFilePath(), _TIME_1_DAY_, false)) { + if ($recommendationContent = Tools::addonsRequest( + 'recommendation', + array('controller' => $this->context->controller->controller_name) + )) { + $recommendationContent = json_decode($recommendationContent, true); + if (!isset($this->context->cookie->{$this->context->controller->controller_name.'_key'})) { + $this->context->cookie->{$this->context->controller->controller_name.'_key'} = ''; + } + if ($this->context->cookie->{$this->context->controller->controller_name.'_key'} != $recommendationContent['key']) { + unset($this->context->cookie->{$this->context->controller->controller_name.'_closed'}); + } + $this->context->cookie->{$this->context->controller->controller_name.'_key'} = $recommendationContent['key']; + if (isset($recommendationContent['success']) && $recommendationContent['success']) { + @file_put_contents( + _PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath(), + $recommendationContent['html'] + ); + } elseif (file_exists(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath())) { + unlink(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath()); + } + return $recommendationContent; + } else { + if (file_exists(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath())) { + unlink(_PS_ROOT_DIR_.$this->context->controller->getRecommendationFilePath()); } } } - $this->ajaxDie(json_encode($response)); + return false; } public function ajaxProcessRecommendationClosed() @@ -4005,6 +4060,11 @@ class AdminControllerCore extends Controller $this->ajaxDie(json_encode($response)); } + public function getRecommendationFilePath() + { + return static::RECOMMENDATION_CONTENT_FILE_PATH; + } + /** * Save list visible columns * diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 63223cc11..df607f131 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -38,6 +38,8 @@ class HelperListCore extends Helper /** @var array WHERE clause determined by filter fields */ protected $_filter; + public $_new_list_header_design = false; + /** @var array Number of results in list per page (used in select field) */ public $_pagination = array(20, 50, 100, 300, 1000); @@ -742,6 +744,7 @@ class HelperListCore extends Helper Context::getContext()->smarty->assign(array( 'page' => $page, 'simple_header' => $this->simple_header, + 'new_list_header_design' => $this->_new_list_header_design, 'total_pages' => $total_pages, 'selected_pagination' => $selected_pagination, 'pagination' => $this->_pagination, diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 874171009..1d09988c0 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -449,7 +449,7 @@ class OrderHistoryCore extends ObjectModel ); if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) { - $objHotelBranchInformation = new HotelBranchInformation($idHotel, $order->id_lang); + $objHotelBranchInformation = new HotelBranchInformation($idHotel); $fields = array_merge( $objHotelBranchInformation->getFields(), $objHotelBranchInformation->getFieldsLang()[$order->id_lang], diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 3d10af263..108b51a75 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -45,8 +45,8 @@ class AdminCartsControllerCore extends AdminController $this->_select = 'CONCAT(c.`firstname`, \' \', c.`lastname`) `customer`, a.id_cart total, TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) AS `time_diff`, - IFNULL(GROUP_CONCAT(o.`id_order`), 0) AS `ids_order`, - IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order, + IFNULL(GROUP_CONCAT(DISTINCT o.`id_order`), 0) AS `ids_order`, + IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(DISTINCT o.`id_order`)) AS filter_ids_order, IF(o.id_order, 1, 0) badge_success, IF(o.id_order, 0, 1) badge_danger, IF(co.id_guest, 1, 0) id_guest'; $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) @@ -333,6 +333,11 @@ class AdminCartsControllerCore extends AdminController public function ajaxPreProcess() { if ($this->tabAccess['edit'] === '1') { + // prevent cart creation when kpi visibility or kpi view is updated. + // @todo: move the below cart creation process required function. + if (in_array(Tools::getValue('action'), array('changeKpiVisibility', 'saveKpiView'))) { + return; + } $id_customer = (int)Tools::getValue('id_customer'); $customer = new Customer((int)$id_customer); $this->context->customer = $customer; diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 1572a1be4..6c763f10c 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -71,7 +71,14 @@ class AdminCustomersControllerCore extends AdminController $titles_array[$gender->id_gender] = $gender->name; } + $groups_array = array(); + $groups = Group::getGroups(Context::getContext()->language->id); + foreach ($groups as $group) { + $groups_array[$group['id_group']] = $group['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->_use_found_rows = false; $this->fields_list = array( 'id_customer' => array( @@ -107,9 +114,25 @@ class AdminCustomersControllerCore extends AdminController } $this->fields_list = array_merge($this->fields_list, array( + 'default_group_name' => array( + 'title' => $this->l('Default Group'), + 'optional' => true, + 'type' => 'select', + 'list' => $groups_array, + 'filter_key' => 'a!id_default_group', + ), + 'total_orders' => array( + 'title' => $this->l('Number of orders'), + 'optional' => true, + 'visible_default' => true, + 'havingFilter' => true, + 'order_key' => 'total_orders' + ), 'total_spent' => array( 'title' => $this->l('Sales'), 'type' => 'price', + 'optional' => true, + 'visible_default' => true, 'search' => false, 'havingFilter' => true, 'align' => 'text-right', @@ -155,13 +178,19 @@ class AdminCustomersControllerCore extends AdminController parent::__construct(); $this->_select = ' - a.date_add, gl.name as title, ( + a.date_add, gl.name as title, grl.name as default_group_name, ( SELECT SUM(total_paid_real / conversion_rate) FROM '._DB_PREFIX_.'orders o WHERE o.id_customer = a.id_customer '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' AND o.valid = 1 ) as total_spent, ( + SELECT COUNT(o.`id_order`) + FROM '._DB_PREFIX_.'orders o + WHERE o.id_customer = a.id_customer + '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' + AND o.valid = 1 + ) as total_orders, ( SELECT c.date_add FROM '._DB_PREFIX_.'guest g LEFT JOIN '._DB_PREFIX_.'connections c ON c.id_guest = g.id_guest WHERE g.id_customer = a.id_customer @@ -326,6 +355,8 @@ class AdminCustomersControllerCore extends AdminController ); } + $this->_new_list_header_design = true; + return parent::renderList(); } @@ -601,7 +632,7 @@ class AdminCustomersControllerCore extends AdminController } $birthday = explode('-', $this->getFieldValue($obj, 'birthday')); - + $this->fields_value = array( 'years' => Tools::getValue('years', $this->getFieldValue($obj, 'birthday') ? $birthday[0] : 0), 'months' => Tools::getValue('months', $this->getFieldValue($obj, 'birthday') ? $birthday[1] : 0), @@ -1062,7 +1093,7 @@ class AdminCustomersControllerCore extends AdminController $days = Tools::getValue('days'); $months = Tools::getValue('months'); $years = Tools::getValue('years'); - + if ($days || $months || $years) { if (!$days) { $this->errors[] = Tools::displayError("Please select a valid date of birthday"); @@ -1074,10 +1105,10 @@ class AdminCustomersControllerCore extends AdminController $this->errors[] = Tools::displayError("Please select a valid month of birthday"); } } - + $customer = new Customer(); $this->errors = array_merge($this->errors, $customer->validateFieldsRequiredDatabase()); - + return parent::processSave(); } diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index facba168f..11ffe69e6 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -27,7 +27,7 @@ class AdminDashboardControllerCore extends AdminController { - const DASHBOARD_RECOMMENDATION_CONTENT = '/cache/dashboard_recommendation.html'; + const RECOMMENDATION_CONTENT_FILE_PATH = '/cache/dashboard_recommendation.html'; public function __construct() { @@ -502,15 +502,4 @@ class AdminDashboardControllerCore extends AdminController die(json_encode($return)); } - - public function getRecommendationContent() - { - if (!Tools::isFresh(self::DASHBOARD_RECOMMENDATION_CONTENT, _TIME_1_DAY_, false)) { - @file_put_contents(_PS_ROOT_DIR_.self::DASHBOARD_RECOMMENDATION_CONTENT, Tools::addonsRequest('dashboard-recommendation')); - } - if (file_exists(_PS_ROOT_DIR_.self::DASHBOARD_RECOMMENDATION_CONTENT)) { - return Tools::file_get_contents(_PS_ROOT_DIR_.self::DASHBOARD_RECOMMENDATION_CONTENT); - } - return false; - } } diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index d6f8adb30..aaba53ffa 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -175,7 +175,7 @@ class AdminLocalizationControllerCore extends AdminController if (($iso_localization_pack = Tools::getValue('iso_localization_pack')) && Validate::isFileName($iso_localization_pack)) { if (Tools::getValue('download_updated_pack') == '1' || defined('_PS_HOST_MODE_')) { - $pack = @Tools::file_get_contents(_PS_API_URL_.'/localization/'.$version.'/'.$iso_localization_pack.'.xml'); + $pack = @Tools::file_get_contents(_QLO_API_URL_.'/localization/'.$version.'/'.$iso_localization_pack.'.xml'); } else { $pack = false; } @@ -226,7 +226,7 @@ class AdminLocalizationControllerCore extends AdminController $localizations_pack = false; $this->tpl_option_vars['options_content'] = $this->renderOptions(); - $xml_localization = Tools::simplexml_load_file(_PS_API_URL_.'/rss/localization.xml'); + $xml_localization = Tools::simplexml_load_file(_QLO_API_URL_.'/xml/localization.xml'); if (!$xml_localization) { $localization_file = _PS_ROOT_DIR_.'/localization/localization.xml'; if (file_exists($localization_file)) { @@ -248,7 +248,7 @@ class AdminLocalizationControllerCore extends AdminController } if (!$localizations_pack) { - return $this->displayWarning($this->l('Cannot connect to '._PS_API_URL_)); + return $this->displayWarning($this->l('Cannot connect to '._QLO_API_URL_)); } // Add local localization .xml files to the list if they are not already there diff --git a/controllers/admin/AdminModulesCatalogController.php b/controllers/admin/AdminModulesCatalogController.php index 72888b9d8..6fb11effa 100644 --- a/controllers/admin/AdminModulesCatalogController.php +++ b/controllers/admin/AdminModulesCatalogController.php @@ -23,7 +23,7 @@ class AdminModulesCatalogControllerCore extends AdminController public $modules; - const CATALOG_RECOMMENDATION_CONTENT = '/cache/catalog_recommendation.html'; + const RECOMMENDATION_CONTENT_FILE_PATH = '/cache/catalog_recommendation.html'; const ELEMENT_TYPE_MODULE = 1; const ELEMENT_TYPE_THEME = 2; @@ -240,17 +240,6 @@ class AdminModulesCatalogControllerCore extends AdminController ); } - public function getRecommendationContent() - { - if (!Tools::isFresh(self::CATALOG_RECOMMENDATION_CONTENT, _TIME_1_DAY_, false)) { - @file_put_contents(_PS_ROOT_DIR_.self::CATALOG_RECOMMENDATION_CONTENT, Tools::addonsRequest('catalog-recommendation')); - } - if (file_exists(_PS_ROOT_DIR_.self::CATALOG_RECOMMENDATION_CONTENT)) { - return Tools::file_get_contents(_PS_ROOT_DIR_.self::CATALOG_RECOMMENDATION_CONTENT); - } - return false; - } - public function sortList(&$list, $type) { diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 89d0327ac..cf78be63c 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -168,6 +168,15 @@ class AdminNormalProductsControllerCore extends AdminController $join_category = true; } + $priceAdditionType = array( + Product::PRICE_ADDITION_TYPE_WITH_ROOM => $this->l('Add price in room price'), + Product::PRICE_ADDITION_TYPE_INDEPENDENT => $this->l('Convenience Fee') + ); + $priceCalculationMethod = array( + Product::PRICE_CALCULATION_METHOD_PER_BOOKING => $this->l('Add price once for the booking range'), + Product::PRICE_CALCULATION_METHOD_PER_DAY => $this->l('Add price for each day of booking') + ); + $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 '.StockAvailable::addSqlShopRestriction(null, null, 'sav').') '; @@ -188,7 +197,7 @@ class AdminNormalProductsControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product` rsp ON (rsp.`id_product` = a.`id_product`) LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)'; - $this->_select .= ' IF(a.`auto_add_to_cart`, "'.$this->l('Yes').'", "'.$this->l('No').'") as auto_added, IF(a.`auto_add_to_cart`, 1, 0) as badge_success, (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, '; + $this->_select .= ' IF(a.`auto_add_to_cart`, "'.$this->l('Yes').'", "'.$this->l('No').'") as auto_added, IF(a.`auto_add_to_cart`, 1, 0) as badge_success, IF(a.`show_at_front`, "'.$this->l('Yes').'", "'.$this->l('No').'") as show_at_front_txt, IF(a.`price_calculation_method` = '.(int)Product::PRICE_CALCULATION_METHOD_PER_DAY.', "'.$this->l('Per Day').'", "'.$this->l('Per Booking').'") as price_calculation_method_txt, (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, '; $this->_select .= ' COUNT(rsp.`id_product`) as products_associated, hrt.`adults`, hrt.`children`, 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`'; @@ -227,14 +236,62 @@ class AdminNormalProductsControllerCore extends AdminController 'title' => $this->l('Associated Rooms types'), 'class' => 'fixed-width-sm', 'havingFilter' => true, + 'optional' => true, + 'visible_default' => true, ); $this->fields_list['auto_added'] = array( 'title' => $this->l('Auto Added'), 'filter_key' => 'a!auto_add_to_cart', 'align' => 'text-center', 'type' => 'bool', + 'optional' => true, + 'visible_default' => true, 'badge_success' => true ); + $this->fields_list['show_at_front_txt'] = array( + 'title' => $this->l('Show at Front'), + 'filter_key' => 'a!show_at_front', + 'align' => 'text-center', + 'type' => 'bool', + 'optional' => true, + ); + $this->fields_list['available_for_order'] = array( + 'displayed' => false, + 'title' => $this->l('Available for order'), + 'filter_key' => 'a!available_for_order', + 'type' => 'bool', + ); + $this->fields_list['price_addition_type'] = array( + 'displayed' => false, + 'title' => $this->l('Price display preference'), + 'filter_key' => 'a!price_addition_type', + 'type' => 'select', + 'list' => $priceAdditionType, + ); + $this->fields_list['price_calculation_method_txt'] = array( + 'title' => $this->l('Price calculation method'), + 'filter_key' => 'a!price_calculation_method', + 'type' => 'select', + 'list' => $priceCalculationMethod, + 'visible_default' => true, + 'optional' => true, + ); + $this->servicesCategory = array(); + $idServiceCategory = Configuration::get('PS_SERVICE_CATEGORY'); + $this->objLocationsCategory = new Category($idServiceCategory, $this->context->language->id); + $nestedCategories = Category::getNestedCategories($idServiceCategory); + if ($nestedCategories) { + foreach ($nestedCategories[$idServiceCategory]['children'] as $childCategory) { + $this->buildCategoryOptions($childCategory); + } + } + $this->fields_list['name_category'] = array( + 'title' => $this->l('Default Category'), + 'type' => 'select', + 'list' => $this->servicesCategory, + 'filter_key' => 'a!id_category_default', + 'optional' => true, + ); // $serviceProductType = array( // Product::SERVICE_PRODUCT_WITH_ROOMTYPE => $this->l('Bought with room type'), // Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE => $this->l('Bought without room type') @@ -288,6 +345,18 @@ class AdminNormalProductsControllerCore extends AdminController } } + private function buildCategoryOptions($category) + { + $space = str_repeat(' ', 5 * (($category['level_depth'] - $this->objLocationsCategory->level_depth) - 1)); + $this->servicesCategory[$category['id_category']] = $space.$category['name']; + + if (isset($category['children']) && count($category['children'])) { + foreach ($category['children'] as $childCategory) { + $this->buildCategoryOptions($childCategory); + } + } + } + public function getBuyingOption($service_product_type, $row) { if ($service_product_type == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { @@ -2446,6 +2515,9 @@ class AdminNormalProductsControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('duplicate'); $this->addRowAction('delete'); + + $this->_new_list_header_design = true; + return parent::renderList(); } @@ -3007,7 +3079,7 @@ class AdminNormalProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); $tax_rates = array( diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index daffe2073..9c6d1fe61 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -183,7 +183,6 @@ class AdminOrdersControllerCore extends AdminController 'list' => $this->hotelsArray, 'optional' => true, 'class' => 'chosen', - 'remove_onchange' => true, 'visible_default' => true ), 'room_type_name' => array( @@ -193,7 +192,6 @@ class AdminOrdersControllerCore extends AdminController 'list' => $this->roomTypesArray, 'optional' => false, 'class' => 'chosen', - 'remove_onchange' => true, 'visible_default' => false, 'displayed' => false, ), @@ -204,7 +202,6 @@ class AdminOrdersControllerCore extends AdminController 'list' => $this->roomsArray, 'optional' => false, 'class' => 'chosen', - 'remove_onchange' => true, 'visible_default' => false, 'displayed' => false, ), @@ -299,7 +296,6 @@ class AdminOrdersControllerCore extends AdminController 'filter_key' => 'a!source', 'list' => $this->all_order_sources, 'optional' => true, - 'remove_onchange' => true, 'visible_default' => true ), 'osname' => array( @@ -1119,6 +1115,8 @@ class AdminOrdersControllerCore extends AdminController $this->tpl_list_vars['title'] = $this->l('Orders'); + $this->_new_list_header_design = true; + return parent::renderList(); } @@ -5605,13 +5603,14 @@ class AdminOrdersControllerCore extends AdminController $new_date_to = trim(date('Y-m-d', strtotime($product_informations['date_to']))); $obj_booking_detail = new HotelBookingDetail(); $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to); + $id_room = Tools::getValue('id_room'); if (trim(Tools::getValue('id_hotel')) == '') { die(json_encode(array( 'result' => false, 'error' => Tools::displayError('Hotel Id is mising.'), ))); - } elseif (trim(Tools::getValue('id_room')) == '') { + } elseif (trim($id_room) == '') { die(json_encode(array( 'result' => false, 'error' => Tools::displayError('Room Id is missing.'), @@ -5619,22 +5618,22 @@ class AdminOrdersControllerCore extends AdminController } elseif (trim(date('Y-m-d', strtotime($product_informations['date_from']))) == '') { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('Please Enter Check In Date.'), + 'error' => Tools::displayError('Please enter check-in date.'), ))); } elseif (!Validate::isDateFormat($new_date_from)) { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('Please Enter a Valid Check In Date.'), + 'error' => Tools::displayError('Please enter a valid check-in date.'), ))); } elseif ($new_date_to == '') { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('Please Enter Check Out Date.'), + 'error' => Tools::displayError('Please enter check-out date.'), ))); } elseif (!Validate::isDateFormat($new_date_to)) { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('Please Enter a valid Check out Date.'), + 'error' => Tools::displayError('Please enter a valid check-out date.'), ))); } if ($this->context->employee->isSuperAdmin()) { @@ -5647,14 +5646,14 @@ class AdminOrdersControllerCore extends AdminController if ($new_date_from < $compareDate) { die(json_encode(array( 'result' => false, - 'error' => sprintf(Tools::displayError('Check In date should not be date before %s.'),$compareDate) + 'error' => sprintf(Tools::displayError('Check-in date should not be date before %s.'),$compareDate) ))); } } if ($new_date_to <= $new_date_from) { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('Check out Date Should be after Check In date.'), + 'error' => Tools::displayError('Check-out date should be after check-in date.'), ))); } elseif (!Validate::isUnsignedInt($product_quantity)) { die(json_encode(array( @@ -5667,7 +5666,20 @@ class AdminOrdersControllerCore extends AdminController if ($rooms_booked) { die(json_encode(array( 'result' => false, - 'error' => Tools::displayError('This Room Unavailable For Selected Duration.'), + 'error' => Tools::displayError('This room is unavailable for selected duration.'), + ))); + } + + $objHotelRoomDisableDates = new HotelRoomDisableDates(); + $params = array( + 'id_room' => $id_room, + 'date_from' => $new_date_from, + 'date_to' => $new_date_to + ); + if ($objHotelRoomDisableDates->checkIfRoomAlreadyDisabled($params)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('This room is disabled in selected duration.'), ))); } } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 26ae59f62..5e0da92b9 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -259,7 +259,6 @@ class AdminProductsControllerCore extends AdminController 'list' => $this->hotelsArray, 'optional' => true, 'class' => 'chosen', - 'remove_onchange' => true, 'visible_default' => true, ); } @@ -308,7 +307,6 @@ class AdminProductsControllerCore extends AdminController 'list' => array(1 => $this->l('Yes'), 0 => $this->l('No')), 'optional' => true, 'visible_default' => true, - 'remove_onchange' => true, 'orderby' => false ); @@ -412,7 +410,6 @@ class AdminProductsControllerCore extends AdminController 'type' => 'select', 'list' => $this->locationsAndHotels, 'filter_key' => 'a!id_category_default', - 'remove_onchange' => true, 'displayed' => false, ); @@ -1090,16 +1087,18 @@ class AdminProductsControllerCore extends AdminController } $id_product = Tools::getValue('id_product'); - $id_adv_pmt = Tools::getValue('id_adv_pmt'); if ($id_adv_pmt) { $obj_adv_pmt = new HotelAdvancedPayment($id_adv_pmt); } else { $obj_adv_pmt = new HotelAdvancedPayment(); + if ($adv_pmt_info = $obj_adv_pmt->getIdAdvPaymentByIdProduct($id_product)) { + // To prevent duplication from two separate tabs + $obj_adv_pmt = new HotelAdvancedPayment((int) $adv_pmt_info['id']); + } } $adv_payment_active = Tools::getValue('adv_payment_active'); - $obj_adv_pmt->id_product = $id_product; $obj_adv_pmt->active = $adv_payment_active; @@ -2550,6 +2549,8 @@ class AdminProductsControllerCore extends AdminController $this->tpl_list_vars['title'] = $this->l('Room Types'); + $this->_new_list_header_design = true; + return parent::renderList(); } @@ -3177,12 +3178,8 @@ class AdminProductsControllerCore extends AdminController $objRoomTypeServiceProductPrice->id_element = $idProduct; $objRoomTypeServiceProductPrice->element_type = RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE; } - $objRoomTypeServiceProductPrice->price = $price; - if ($idTaxRulesGroup) { - $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; - } - + $objRoomTypeServiceProductPrice->id_tax_rules_group = $idTaxRulesGroup; $objRoomTypeServiceProductPrice->save(); } else { // create new association @@ -3909,7 +3906,7 @@ class AdminProductsControllerCore extends AdminController } else { $address->id_country = (int)$address_infos['id_country']; $address->id_state = (int)$address_infos['id_state']; - $address->zipcode = $address_infos['postcode']; + $address->postcode = $address_infos['postcode']; } $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true); diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index b5f8d5dd9..4d5cd5237 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -237,18 +237,18 @@ class AdminSearchControllerCore extends AdminController && ($this->_list['products'] = Product::searchByName($this->context->language->id, $this->query)) ) { $objRoomType = new HotelRoomType(); - $accessableHotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1); + $accessibleHotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1); $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); foreach ($this->_list['products'] as $key => $product) { if ($roomInfo = $objRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { - if (!in_array($roomInfo['id_hotel'], $accessableHotels)) { + if (!in_array($roomInfo['id_hotel'], $accessibleHotels)) { unset($this->_list['products'][$key]); } } else if ($associatedData = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($product['id_product'])) { $count = 0; foreach ($associatedData['room_types'] as $id_room_type) { $objRoomType = new HotelRoomType($id_room_type); - if (in_array($objRoomType->id_hotel, $accessableHotels)) { + if (in_array($objRoomType->id_hotel, $accessibleHotels)) { $count += 1; } } @@ -261,14 +261,14 @@ class AdminSearchControllerCore extends AdminController } } - if (isset($this->controllerAccess['AdminProducts']) - && $this->controllerAccess['AdminProducts'] + if (!isset($this->controllerAccess['AdminProducts']) + || !$this->controllerAccess['AdminProducts'] ) { unset($this->_list['products']); } - if (isset($this->controllerAccess['AdminNormalProducts']) - && $this->controllerAccess['AdminNormalProducts'] + if (!isset($this->controllerAccess['AdminNormalProducts']) + || !$this->controllerAccess['AdminNormalProducts'] ) { unset($this->_list['service_products']); } diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index b72bdb1c2..e7017e12f 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -92,10 +92,11 @@ class GuestTrackingControllerCore extends FrontController $customer = new Customer((int)$order->id_customer); if (!Validate::isLoadedObject($customer)) { $this->errors[] = Tools::displayError('Invalid customer'); - } elseif (!Tools::getValue('password')) { + } elseif (!Tools::getValue('password') + || !Validate::isPasswd(Tools::getValue('password') + )) { $this->errors[] = Tools::displayError('Invalid password.'); } elseif (!$customer->transformToCustomer($this->context->language->id, Tools::getValue('password'))) { - // @todo clarify error message $this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.'); } else { $this->context->smarty->assign('transformSuccess', true); @@ -105,6 +106,63 @@ class GuestTrackingControllerCore extends FrontController } } + public function displayAjaxGetRoomTypeBookingDemands() + { + $response = array('extra_demands' => false); + + 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, + )); + } + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $idProduct, + $dateFrom, + $dateTo, + 0, + 0, + $useTax + )) { + $this->context->smarty->assign(array( + 'useTax' => $useTax, + 'additionalServices' => $additionalServices, + )); + } + + $this->context->smarty->assign(array( + 'objOrder' => new Order($idOrder), + )); + + $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl'); + } + + $this->ajaxDie(json_encode($response)); + } + /** * Assign template vars related to page content * @see FrontController::initContent() @@ -113,60 +171,6 @@ class GuestTrackingControllerCore extends FrontController { parent::initContent(); - $method = Tools::getValue('method'); - if ($method == 'getRoomTypeBookingDemands') { - $response = array('reload' => false); - $extraDemandsTpl = ''; - if (($idProduct = Tools::getValue('id_product')) - && ($idOrder = Tools::getValue('id_order')) - && ($dateFrom = Tools::getValue('date_from')) - && ($dateTo = Tools::getValue('date_to')) - ) { - $objBookingDemand = new HotelBookingDemands(); - $customer = new Customer((int)$order->id_customer); - $useTax = 0; - if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) { - $useTax = 1; - } - if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $idProduct, - 0, - $dateFrom, - $dateTo, - 1, - 0, - $useTax - )) { - $this->context->smarty->assign( - array( - 'useTax' => $useTax, - 'extraDemands' => $extraDemands, - ) - ); - } - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $idProduct, - $dateFrom, - $dateTo, - 0, - 0, - $useTax - )) { - $this->context->smarty->assign(array( - 'useTax' => $useTax, - 'additionalServices' => $additionalServices, - )); - } - $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); - } - $this->ajaxDie(json_encode($response)); - } - /* Handle brute force attacks */ if (count($this->errors)) { sleep(1); @@ -216,6 +220,7 @@ class GuestTrackingControllerCore extends FrontController $order->id_order_state = (int)$order->getCurrentState(); $order->invoice = (OrderState::invoiceAvailable((int)$order->id_order_state) && $order->invoice_number); $order->order_history = $order->getHistory((int)$this->context->language->id, false, true); + $order->overbooking_order_states = OrderState::getOverBookingStates(); $order->carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang); $order->address_invoice = new Address((int)$order->id_address_invoice); $order->address_delivery = new Address((int)$order->id_address_delivery); @@ -554,6 +559,13 @@ class GuestTrackingControllerCore extends FrontController $customerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail); } + $idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id); + $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); + $hotelAddressInfo = HotelBranchInformation::getAddress($idHotel); + + $objHotelBranchRefundRules = new HotelBranchRefundRules(); + $hotelRefundRules = $objHotelBranchRefundRules->getHotelRefundRules($idHotel, 0, 1); + // set order specific values $order->total_convenience_fee_ti = $total_convenience_fee_ti; $order->total_convenience_fee_te = $total_convenience_fee_te; @@ -564,11 +576,14 @@ class GuestTrackingControllerCore extends FrontController $order->back_ord_msg = Configuration::get('WK_BO_MESSAGE'); $order->order_has_invoice = $order->hasInvoice(); $order->cart_htl_data = $cartHotelData; - $order->non_requested_rooms = $nonRequestedRooms; $order->customerGuestDetail = $customerGuestDetail; + $order->obj_hotel_branch_information = $objHotelBranchInformation; + $order->hotel_address_info = $hotelAddressInfo; + $order->hotel_refund_rules = $hotelRefundRules; //end Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order)); + } } @@ -596,9 +611,48 @@ class GuestTrackingControllerCore extends FrontController ) ); - $this->addJS(_THEME_JS_DIR_.'history.js'); - $this->addCSS(_THEME_CSS_DIR_.'history.css'); - $this->addCSS(_THEME_CSS_DIR_.'addresses.css'); + if (Tools::getValue('ajax') != 'true') { + $this->addCSS(_THEME_CSS_DIR_.'order-detail.css'); + + $this->addJS(array( + _THEME_JS_DIR_.'order-detail.js', + _THEME_JS_DIR_.'tools.js', + )); + + $this->addJqueryPlugin(array('fancybox', 'scrollTo', 'footable', 'footable-sort')); + $this->addJqueryUI(array('ui.tooltip'), 'base', true); + + // load Google Maps library if configured + if (!count($this->errors)) { + $ordersCollection = Order::getByReference(Tools::getValue('order_reference')); + if ($objOrder = $ordersCollection->getFirst()) { + if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($objOrder->id)) { + $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); + if (Validate::isLoadedObject($objHotelBranchInformation)) { + if ($apiKey = Configuration::get('PS_API_KEY')) { + if (floatval($objHotelBranchInformation->latitude) != 0 + && floatval($objHotelBranchInformation->longitude) != 0 + ) { + Media::addJsDef(array( + 'hotel_location' => array( + 'latitude' => $objHotelBranchInformation->latitude, + 'longitude' => $objHotelBranchInformation->longitude, + 'map_input_text' => $objHotelBranchInformation->map_input_text, + ), + 'hotel_name' => $objHotelBranchInformation->hotel_name, + )); + + $this->addJS( + 'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places&language='. + $this->context->language->iso_code.'®ion='.$this->context->country->iso_code + ); + } + } + } + } + } + } + } } protected function processAddressFormat(Address $delivery, Address $invoice) diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 8e41935c8..09ba285bb 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -36,15 +36,9 @@ class HistoryControllerCore extends FrontController parent::setMedia(); $this->addCSS(array( _THEME_CSS_DIR_.'history.css', - _THEME_CSS_DIR_.'addresses.css' )); - $this->addJS(array( - _THEME_JS_DIR_.'history.js', - _THEME_JS_DIR_.'tools.js' // retro compat themes 1.5 - )); - $this->addJqueryPlugin(array('fancybox')); //fancybox not found for some client theme - $this->addJqueryPlugin(array('scrollTo', 'footable', 'footable-sort')); - $this->addJqueryUI('ui.tooltip', 'base', true); + + $this->addJqueryPlugin(array('footable', 'footable-sort')); } /** diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 3f9f89187..afa1ea9e8 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -43,283 +43,19 @@ class OrderDetailControllerCore extends FrontController header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); } - /** - * Start forms process - * @see FrontController::postProcess() - */ - public function postProcess() - { - if (Tools::isSubmit('submitMessage')) { - $idOrder = (int)Tools::getValue('id_order'); - $msgText = Tools::getValue('msgText'); - - if (!$idOrder || !Validate::isUnsignedId($idOrder)) { - $this->errors[] = Tools::displayError('The order is no longer valid.'); - } elseif (empty($msgText)) { - $this->errors[] = Tools::displayError('The message cannot be blank.'); - } elseif (!Validate::isMessage($msgText)) { - $this->errors[] = Tools::displayError('This message is invalid (HTML is not allowed).'); - } - if (!count($this->errors)) { - $order = new Order($idOrder); - if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) { - //check if a thread already exist - $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($this->context->customer->email, $order->id); - $id_product = (int)Tools::getValue('id_product'); - $cm = new CustomerMessage(); - if (!$id_customer_thread) { - $ct = new CustomerThread(); - $ct->id_contact = 0; - $ct->id_customer = (int)$order->id_customer; - $ct->id_shop = (int)$this->context->shop->id; - if ($id_product && $order->orderContainProduct($id_product)) { - $ct->id_product = $id_product; - } - $ct->id_order = (int)$order->id; - $ct->id_lang = (int)$this->context->language->id; - $ct->email = $this->context->customer->email; - $ct->status = 'open'; - $ct->token = Tools::passwdGen(12); - $ct->add(); - } else { - $ct = new CustomerThread((int)$id_customer_thread); - $ct->status = 'open'; - $ct->update(); - } - - $cm->id_customer_thread = $ct->id; - $cm->message = $msgText; - $cm->ip_address = (int)ip2long($_SERVER['REMOTE_ADDR']); - $cm->add(); - - if (!Configuration::get('PS_MAIL_EMAIL_MESSAGE')) { - $to = strval(Configuration::get('PS_SHOP_EMAIL')); - } else { - $to = new Contact((int)Configuration::get('PS_MAIL_EMAIL_MESSAGE')); - $to = strval($to->email); - } - $toName = strval(Configuration::get('PS_SHOP_NAME')); - $customer = $this->context->customer; - - $product = new Product($id_product); - $product_name = ''; - if (Validate::isLoadedObject($product) && isset($product->name[(int)$this->context->language->id])) { - $product_name = $product->name[(int)$this->context->language->id]; - } - - if (Validate::isLoadedObject($customer)) { - Mail::Send( - $this->context->language->id, - 'order_customer_comment', - Mail::l('Message from a customer'), - array( - '{lastname}' => $customer->lastname, - '{firstname}' => $customer->firstname, - '{email}' => $customer->email, - '{id_order}' => (int)$order->id, - '{order_name}' => $order->getUniqReference(), - '{message}' => Tools::nl2br($msgText), - '{product_name}' => $product_name - ), - $to, - $toName, - strval(Configuration::get('PS_SHOP_EMAIL')), - $customer->firstname.' '.$customer->lastname, - null, - null, - _PS_MAIL_DIR_, - false, - null, - null, - $customer->email - ); - } - - if (Tools::getValue('ajax') != 'true') { - Tools::redirect('index.php?controller=order-detail&id_order='.(int)$idOrder); - } - - $this->context->smarty->assign('message_confirmation', true); - } else { - $this->errors[] = Tools::displayError('Order not found'); - } - } - } - } - - public function displayAjax() - { - $this->display(); - } - /** * Assign template vars related to page content * @see FrontController::initContent() */ public function initContent() { + $this->show_breadcrump = true; + parent::initContent(); if (!($id_order = (int) Tools::getValue('id_order')) || !Validate::isUnsignedId($id_order)) { - $this->errors[] = Tools::displayError('Order ID required'); + Tools::redirect($this->context->link->getPageLink('history')); } else { $order = new Order($id_order); - if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) { - // Here handle request from the ajax on order details page i.e refund, additional qty etc - $method = Tools::getValue('method'); - // extra demands popup ajax - if ($method == 'getRoomTypeBookingDemands') { - $response = array('reload' => false); - if (($idProduct = Tools::getValue('id_product')) - && ($idOrder = Tools::getValue('id_order')) - && ($dateFrom = Tools::getValue('date_from')) - && ($dateTo = Tools::getValue('date_to')) - ) { - $objBookingDemand = new HotelBookingDemands(); - $useTax = 0; - $customer = Context::getContext()->customer; - if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) { - $useTax = 1; - } - if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $idProduct, - 0, - $dateFrom, - $dateTo, - 1, - 0, - $useTax - )) { - $this->context->smarty->assign( - array( - 'useTax' => $useTax, - 'extraDemands' => $extraDemands, - ) - ); - } - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $idProduct, - $dateFrom, - $dateTo, - 0, - 0, - $useTax - )) { - $this->context->smarty->assign(array( - 'useTax' => $useTax, - 'additionalServices' => $additionalServices, - )); - } - $this->context->smarty->assign( - array( - 'objOrder' => new Order($idOrder) - ) - ); - $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); - } - - die(json_encode($response)); - } elseif ($method == 'submitRefundRequest') { // room cancellation ajax - $hasError = 0; - if (!$refundReason = Tools::getValue('cancellation_reason')) { - $hasError = 1; - } elseif (!Validate::isCleanHtml($refundReason)) { - $hasError = 1; - } - if ($bookingRefunds = Tools::getValue('bookings_to_refund')) { - if (!count($bookingRefunds = json_decode($bookingRefunds, true))) { - $hasError = 1; - } else { - foreach ($bookingRefunds as $idHtlBooking) { - $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); - if ($objHotelBookingDetail->id_customer != $order->id_customer - || OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking) - ) { - $hasError = 1; - break; - } - } - } - } else { - $hasError = 1; - } - $res = true; - if (!$hasError) { - $hasCancelled = 0; - // if amount paid is > 0 then create refund request else cancel the booking directly - if ($order->getTotalPaid() > 0) { - $objOrderReturn = new OrderReturn(); - $objOrderReturn->id_customer = $order->id_customer; - $objOrderReturn->id_order = $order->id; - $objOrderReturn->state = 0; - $objOrderReturn->by_admin = 0; - $objOrderReturn->question = $refundReason; - $objOrderReturn->save(); - if ($objOrderReturn->id) { - foreach ($bookingRefunds as $idHtlBooking) { - $objHtlBooking = new HotelBookingDetail($idHtlBooking); - $numDays = $objHtlBooking->getNumberOfDays( - $objHtlBooking->date_from, - $objHtlBooking->date_to - ); - - $objOrderReturnDetail = new OrderReturnDetail(); - $objOrderReturnDetail->id_order_return = $objOrderReturn->id; - $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail; - $objOrderReturnDetail->product_quantity = $numDays; - $objOrderReturnDetail->id_htl_booking = $idHtlBooking; - $objOrderReturnDetail->save(); - } - } - // Emails to customer, admin on refund request state change - $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); - } else { - $hasCancelled = 1; - // cancel the booking directly - foreach ($bookingRefunds as $idHtlBooking) { - $objHtlBooking = new HotelBookingDetail($idHtlBooking); - if (!$objHtlBooking->processRefundInBookingTables()) { - die(json_encode(array('status' => 0))); - } else { - // set the message for the cancellation - $message = Tools::displayError('1 Room from').' '.', '.$objHtlBooking->room_type_name.' '.Tools::displayError('has been cancelled by the hotel.'); - $message .= PHP_EOL.Tools::displayError('Reason').': '.$refundReason; - - $objHtlBooking->setBookingCancellationMessage($refundReason); - } - } - - // if all bookings are getting cancelled then cancel the order also - if ($order->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { - $objOrderHistory = new OrderHistory(); - $objOrderHistory->id_order = (int)$order->id; - - $idOrderState = Configuration::get('PS_OS_CANCELED'); - - $useExistingPayment = false; - if (!$order->hasInvoice()) { - $useExistingPayment = true; - } - - $objOrderHistory->changeIdOrderState($idOrderState, $order, $useExistingPayment); - $objOrderHistory->addWithemail(); - } - } - - die(json_encode(array('status' => 1, 'has_cancelled' => $hasCancelled))); - } - - die(json_encode(array('status' => 0))); - } - } else { - die(json_encode(array('status' => 0))); - } - // END ajax request handle - if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) { $id_order_state = (int)$order->getCurrentState(); $carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang); @@ -376,9 +112,9 @@ class OrderDetailControllerCore extends FrontController $cover_image_arr = $product->getCover($type_value['product_id']); if (!empty($cover_image_arr)) { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'home_default'); } else { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default'); } if (isset($customer->id)) { @@ -459,9 +195,18 @@ class OrderDetailControllerCore extends FrontController } } + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_htl_booking'] = $data_v['id']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['id_room'] = $data_v['id_room']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['children'] = $data_v['children']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['child_ages'] = $data_v['child_ages']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_refunded'] = $data_v['is_refunded']; + $cartHotelData[$type_key]['date_diff'][$date_join]['hotel_booking_details'][$data_v['id']]['is_cancelled'] = $data_v['is_cancelled']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; $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, @@ -637,6 +382,13 @@ class OrderDetailControllerCore extends FrontController $objHotelBookingDetail = new HotelBookingDetail(); $htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id); + $idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id); + $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); + $hotelAddressInfo = HotelBranchInformation::getAddress($idHotel); + + $objHotelBranchRefundRules = new HotelBranchRefundRules(); + $hotelRefundRules = $objHotelBranchRefundRules->getHotelRefundRules($idHotel, 0, 1); + $this->context->smarty->assign( array( 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), @@ -651,6 +403,9 @@ class OrderDetailControllerCore extends FrontController 'order_has_invoice' => $order->hasInvoice(), 'cart_htl_data' => $cartHotelData, 'cart_service_products' => $cartServiceProducts, + 'obj_hotel_branch_information' => $objHotelBranchInformation, + 'hotel_address_info' => $hotelAddressInfo, + 'hotel_refund_rules' => $hotelRefundRules, ) ); // } @@ -660,6 +415,7 @@ class OrderDetailControllerCore extends FrontController if ($refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($order->id, 0, 1)) { $refundedAmount = $objOrderReturn->getRefundedAmount($order->id); } + $this->context->smarty->assign( array( 'hasOrderPaid' => $order->hasBeenPaid(), @@ -710,7 +466,7 @@ class OrderDetailControllerCore extends FrontController unset($carrier, $addressInvoice, $addressDelivery); } else { - $this->errors[] = Tools::displayError('This order cannot be found.'); + $this->errors[] = Tools::displayError('The booking cannot be found.'); } unset($order); } @@ -718,12 +474,335 @@ class OrderDetailControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl'); } + public function displayAjaxGetRoomTypeBookingDemands() + { + $response = array('extra_demands' => false); + + 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, + )); + } + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $idProduct, + $dateFrom, + $dateTo, + 0, + 0, + $useTax + )) { + $this->context->smarty->assign(array( + 'useTax' => $useTax, + 'additionalServices' => $additionalServices, + )); + } + + $this->context->smarty->assign(array( + 'objOrder' => new Order($idOrder), + )); + + $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-extra-services.tpl'); + } + + $this->ajaxDie(json_encode($response)); + } + + public function displayAjaxSubmitRefundRequest() + { + $response = array('has_errors' => false); + + $idOrder = Tools::getValue('id_order'); + $idsHtlBooking = Tools::getValue('bookings_to_refund'); + $cancellationReason = trim(Tools::getValue('cancellation_reason')); + + if (!$idsHtlBooking) { + $this->errors[] = Tools::displayError('Please select at least on room for cancellation.'); + } + + if (!$cancellationReason) { + $this->errors[] = Tools::displayError('Please mention a reason for cancellation.'); + } elseif ($cancellationReason && !Validate::isCleanHtml($cancellationReason)) { + $this->errors[] = Tools::displayError('Reason of cancellation is invalid. Please enter valid data.'); + } + + if (!count($this->errors)) { + $objOrder = new Order($idOrder); + if (!(Validate::isLoadedObject($objOrder) && $objOrder->id_customer == $this->context->customer->id)) { + $this->errors[] = Tools::displayError('Something went wrong. Please try later.'); + } elseif ($idsHtlBooking) { + foreach ($idsHtlBooking as $idHtlBooking) { + $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); + if ($objHotelBookingDetail->id_customer != $objOrder->id_customer) { + $this->errors[] = Tools::displayError('Something went wrong. Please try later.'); + break; + } + + if (OrderReturn::getOrdersReturnDetail($objOrder->id, 0, $idHtlBooking)) { + $this->errors[] = Tools::displayError('Some selected rooms have already been requested for cancellation.'); + break; + } + } + } + + if (!count($this->errors)) { + if ((int) $objOrder->total_paid_real == 0) { + foreach ($idsHtlBooking as $idHtlBooking) { + $objHtlBooking = new HotelBookingDetail($idHtlBooking); + $objHtlBooking->save(); + } + } + + // if amount paid is > 0 then create refund request else cancel the booking directly + if ($objOrder->getTotalPaid() > 0) { + $objOrderReturn = new OrderReturn(); + $objOrderReturn->id_customer = $objOrder->id_customer; + $objOrderReturn->id_order = $objOrder->id; + $objOrderReturn->state = 0; + $objOrderReturn->by_admin = 0; + $objOrderReturn->question = $cancellationReason; + $objOrderReturn->save(); + if ($objOrderReturn->id) { + foreach ($idsHtlBooking as $idHtlBooking) { + $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); + $numDays = $objHotelBookingDetail->getNumberOfDays( + $objHotelBookingDetail->date_from, + $objHotelBookingDetail->date_to + ); + + $objOrderReturnDetail = new OrderReturnDetail(); + $objOrderReturnDetail->id_order_return = $objOrderReturn->id; + $objOrderReturnDetail->id_order_detail = $objHotelBookingDetail->id_order_detail; + $objOrderReturnDetail->product_quantity = $numDays; + $objOrderReturnDetail->id_htl_booking = $idHtlBooking; + $objOrderReturnDetail->save(); + } + } + + // Emails to customer, superadmin and employees on refund request state change + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); + } else { + // cancel the booking directly + foreach ($idsHtlBooking as $idHtlBooking) { + $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); + if (!$objHotelBookingDetail->processRefundInBookingTables()) { + $this->errors[] = Tools::displayError('Something went wrong. Please try later.'); + } else { + // set the message for the cancellation + $message = Tools::displayError(sprintf( + "1 room from %s has been cancelled by hotel.\nReason: %s", + $objHotelBookingDetail->room_type_name, + $cancellationReason + )); + + $objHotelBookingDetail->setBookingCancellationMessage($message); + } + } + + // if all bookings are getting cancelled then cancel the order also + if ($objOrder->hasCompletelyRefunded(Order::ORDER_COMPLETE_CANCELLATION_FLAG)) { + $objOrderHistory = new OrderHistory(); + $objOrderHistory->id_order = (int)$objOrder->id; + + $idOrderState = Configuration::get('PS_OS_CANCELED'); + + $useExistingPayment = false; + if (!$objOrder->hasInvoice()) { + $useExistingPayment = true; + } + + $objOrderHistory->changeIdOrderState($idOrderState, $objOrder, $useExistingPayment); + $objOrderHistory->addWithemail(); + + $response['order_cancelled'] = true; + } + } + } + } + + if (count($this->errors)) { + $this->context->smarty->assign(array('errors' => $this->errors)); + $response['errors_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'errors.tpl'); + } + + $response['has_errors'] = (bool) count($this->errors); + + $this->ajaxDie(json_encode($response)); + } + + public function displayAjaxSubmitMessage() + { + $response = array('status' => false); + + $idOrder = (int) Tools::getValue('id_order'); + $msgText = Tools::getValue('msgText'); + + if (!$idOrder || !Validate::isUnsignedId($idOrder)) { + $this->errors[] = Tools::displayError('The order is no longer valid.'); + } elseif (empty($msgText)) { + $this->errors[] = Tools::displayError('The message cannot be blank.'); + } elseif (!Validate::isMessage($msgText)) { + $this->errors[] = Tools::displayError('This message is invalid (HTML is not allowed).'); + } + if (!count($this->errors)) { + $order = new Order($idOrder); + if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) { + //check if a thread already exist + $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($this->context->customer->email, $order->id); + $id_product = (int)Tools::getValue('id_product'); + $cm = new CustomerMessage(); + if (!$id_customer_thread) { + $ct = new CustomerThread(); + $ct->id_contact = 0; + $ct->id_customer = (int)$order->id_customer; + $ct->id_shop = (int)$this->context->shop->id; + if ($id_product && $order->orderContainProduct($id_product)) { + $ct->id_product = $id_product; + } + $ct->id_order = (int)$order->id; + $ct->id_lang = (int)$this->context->language->id; + $ct->email = $this->context->customer->email; + $ct->status = 'open'; + $ct->token = Tools::passwdGen(12); + $ct->add(); + } else { + $ct = new CustomerThread((int)$id_customer_thread); + $ct->status = 'open'; + $ct->update(); + } + + $cm->id_customer_thread = $ct->id; + $cm->message = $msgText; + $cm->ip_address = (int)ip2long($_SERVER['REMOTE_ADDR']); + $cm->add(); + + if (!Configuration::get('PS_MAIL_EMAIL_MESSAGE')) { + $to = strval(Configuration::get('PS_SHOP_EMAIL')); + } else { + $to = new Contact((int)Configuration::get('PS_MAIL_EMAIL_MESSAGE')); + $to = strval($to->email); + } + $toName = strval(Configuration::get('PS_SHOP_NAME')); + $customer = $this->context->customer; + + $product = new Product($id_product); + $product_name = ''; + if (Validate::isLoadedObject($product) && isset($product->name[(int)$this->context->language->id])) { + $product_name = $product->name[(int)$this->context->language->id]; + } + + if (Validate::isLoadedObject($customer)) { + Mail::Send( + $this->context->language->id, + 'order_customer_comment', + Mail::l('Message from a customer'), + array( + '{lastname}' => $customer->lastname, + '{firstname}' => $customer->firstname, + '{email}' => $customer->email, + '{id_order}' => (int)$order->id, + '{order_name}' => $order->getUniqReference(), + '{message}' => Tools::nl2br($msgText), + '{product_name}' => $product_name + ), + $to, + $toName, + strval(Configuration::get('PS_SHOP_EMAIL')), + $customer->firstname.' '.$customer->lastname, + null, + null, + _PS_MAIL_DIR_, + false, + null, + null, + $customer->email + ); + } + + // send message html in json + $response['status'] = true; + + $message = CustomerMessage::getMessagesByOrderId($order->id, false)[0]; + $this->context->smarty->assign(array('message' => $message)); + $response['message_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order-message.tpl'); + } else { + $this->errors[] = Tools::displayError('Order not found'); + } + } + + if (count($this->errors)) { + $this->context->smarty->assign(array('errors' => $this->errors)); + $response['errors_html'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'errors.tpl'); + } + + $response['has_errors'] = (bool) count($this->errors); + + $this->ajaxDie(json_encode($response)); + } + public function setMedia() { if (Tools::getValue('ajax') != 'true') { parent::setMedia(); - $this->addCSS(_THEME_CSS_DIR_.'history.css'); - $this->addCSS(_THEME_CSS_DIR_.'addresses.css'); + + $this->addCSS(_THEME_CSS_DIR_.'order-detail.css'); + + $this->addJS(array( + _THEME_JS_DIR_.'order-detail.js', + _THEME_JS_DIR_.'tools.js', + )); + + $this->addJqueryPlugin(array('fancybox', 'scrollTo', 'footable', 'footable-sort')); + $this->addJqueryUI(array('ui.tooltip'), 'base', true); + + // load Google Maps library if configured + if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder(Tools::getValue('id_order'))) { + $objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id); + if (Validate::isLoadedObject($objHotelBranchInformation)) { + if ($apiKey = Configuration::get('PS_API_KEY')) { + if (floatval($objHotelBranchInformation->latitude) != 0 + && floatval($objHotelBranchInformation->longitude) != 0 + ) { + Media::addJsDef(array( + 'hotel_location' => array( + 'latitude' => $objHotelBranchInformation->latitude, + 'longitude' => $objHotelBranchInformation->longitude, + 'map_input_text' => $objHotelBranchInformation->map_input_text, + ), + 'hotel_name' => $objHotelBranchInformation->hotel_name, + )); + + $this->addJS( + 'https://maps.googleapis.com/maps/api/js?key='.$apiKey.'&libraries=places&language='. + $this->context->language->iso_code.'®ion='.$this->context->country->iso_code + ); + } + } + } + } } } } diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 465c6a7ca..2cd2a223c 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -173,7 +173,9 @@ class OrderOpcControllerCore extends ParentOrderController if (!count($this->errors)) { $customer = new Customer($this->context->customer->id); - if ($customer->transformToCustomer($this->context->language->id, $passwd)) { + if (!$customer->isGuest()) { + $this->errors[] = Tools::displayError('This account is already registered as a customer.'); + } else if ($customer->transformToCustomer($this->context->language->id, $passwd)) { $this->context->updateCustomer($customer); } else { $this->errors[] = Tools::displayError('An error occurred while transforming your account into a registered customer.'); diff --git a/install/data/xml/meta.xml b/install/data/xml/meta.xml index 21ea7b2b4..31a7f1df6 100644 --- a/install/data/xml/meta.xml +++ b/install/data/xml/meta.xml @@ -68,6 +68,10 @@ history 1 + + order-detail + 1 + identity 1 diff --git a/install/data/xml/theme_meta.xml b/install/data/xml/theme_meta.xml index c3574ec94..041a7e1c7 100644 --- a/install/data/xml/theme_meta.xml +++ b/install/data/xml/theme_meta.xml @@ -15,31 +15,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install/langs/bg/data/meta.xml b/install/langs/bg/data/meta.xml index 4178d2d38..62896ab65 100644 --- a/install/langs/bg/data/meta.xml +++ b/install/langs/bg/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Детайл за резервацията + + + detal-za-rezervaciata + Identity diff --git a/install/langs/bn/data/meta.xml b/install/langs/bn/data/meta.xml index 16ac4d9b0..5a6ac00ea 100644 --- a/install/langs/bn/data/meta.xml +++ b/install/langs/bn/data/meta.xml @@ -96,6 +96,12 @@ order-history + + বুকিং বিবরণ + + + booking-biborn + পরিচয় diff --git a/install/langs/br/data/meta.xml b/install/langs/br/data/meta.xml index 3f4f58bbf..420965fe5 100644 --- a/install/langs/br/data/meta.xml +++ b/install/langs/br/data/meta.xml @@ -96,6 +96,12 @@ histórico-de-pedidos + + Devezh bemdez + + + devezh-bemdez + Identificação diff --git a/install/langs/cs/data/meta.xml b/install/langs/cs/data/meta.xml index d8a83d7b8..8aea57f69 100644 --- a/install/langs/cs/data/meta.xml +++ b/install/langs/cs/data/meta.xml @@ -96,6 +96,12 @@ historie-objednavek + + Detail rezervace + + + detail-rezervace + Identity diff --git a/install/langs/de/data/meta.xml b/install/langs/de/data/meta.xml index 5a96fc36c..40cab6b97 100644 --- a/install/langs/de/data/meta.xml +++ b/install/langs/de/data/meta.xml @@ -96,6 +96,12 @@ bestellungsverlauf + + Buchungsdetails + + + buchungsdetails + Kennung diff --git a/install/langs/en/data/meta.xml b/install/langs/en/data/meta.xml index 4178d2d38..2133a7871 100644 --- a/install/langs/en/data/meta.xml +++ b/install/langs/en/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Booking details + + + order-detail + Identity diff --git a/install/langs/es/data/meta.xml b/install/langs/es/data/meta.xml index 742f07554..c4c470c55 100644 --- a/install/langs/es/data/meta.xml +++ b/install/langs/es/data/meta.xml @@ -96,6 +96,12 @@ historial-compra + + Detalle de reserva + + + detalle-de-reserva + Datos personales diff --git a/install/langs/fa/data/meta.xml b/install/langs/fa/data/meta.xml index f98544fea..9383db838 100644 --- a/install/langs/fa/data/meta.xml +++ b/install/langs/fa/data/meta.xml @@ -96,6 +96,12 @@ order-history + + جزئیات رزرو + + + jazayiat-rezrv + مشخصات diff --git a/install/langs/fr/data/meta.xml b/install/langs/fr/data/meta.xml index 29ed00b90..6cc7ba3d8 100644 --- a/install/langs/fr/data/meta.xml +++ b/install/langs/fr/data/meta.xml @@ -96,6 +96,12 @@ historique-commandes + + Détails de réservation + + + details-de-reservation + Identité diff --git a/install/langs/he/data/meta.xml b/install/langs/he/data/meta.xml index 5275d4254..3d5652917 100644 --- a/install/langs/he/data/meta.xml +++ b/install/langs/he/data/meta.xml @@ -96,6 +96,12 @@ הסטוריית-הזמנות + + פרטי ההזמנה + + + partei-hahazmana + זהות diff --git a/install/langs/hr/data/meta.xml b/install/langs/hr/data/meta.xml index 4178d2d38..fbaefdcda 100644 --- a/install/langs/hr/data/meta.xml +++ b/install/langs/hr/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Detalji rezervacije + + + detalji-rezervacije + Identity diff --git a/install/langs/hu/data/meta.xml b/install/langs/hu/data/meta.xml index ea83417f0..ee3c90826 100644 --- a/install/langs/hu/data/meta.xml +++ b/install/langs/hu/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Foglalás részletei + + + foglalas-reszletei + Identity diff --git a/install/langs/id/data/meta.xml b/install/langs/id/data/meta.xml index 39cdbf10f..ebf743ab5 100644 --- a/install/langs/id/data/meta.xml +++ b/install/langs/id/data/meta.xml @@ -96,6 +96,12 @@ riwayat-pembelian + + Detail Pemesanan + + + detail-pemesanan + Identitas diff --git a/install/langs/it/data/meta.xml b/install/langs/it/data/meta.xml index 72c2384f8..6ef49e751 100644 --- a/install/langs/it/data/meta.xml +++ b/install/langs/it/data/meta.xml @@ -96,6 +96,12 @@ cronologia-ordini + + Dettaglio prenotazione + + + dettaglio-prenotazione + Identità diff --git a/install/langs/lt/data/meta.xml b/install/langs/lt/data/meta.xml index 4178d2d38..838e3c6de 100644 --- a/install/langs/lt/data/meta.xml +++ b/install/langs/lt/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Užsakymo informacija + + + uzsakymo-informacija + Identity diff --git a/install/langs/mk/data/meta.xml b/install/langs/mk/data/meta.xml index ea83417f0..7288c073d 100644 --- a/install/langs/mk/data/meta.xml +++ b/install/langs/mk/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Детали за резервацијата + + + detali-za-rezervacijata + Identity diff --git a/install/langs/nl/data/meta.xml b/install/langs/nl/data/meta.xml index f0aaf849c..8c256986b 100644 --- a/install/langs/nl/data/meta.xml +++ b/install/langs/nl/data/meta.xml @@ -96,6 +96,12 @@ bestel-overzicht + + Boekingsdetails + + + boekingsdetails + Identiteit diff --git a/install/langs/no/data/meta.xml b/install/langs/no/data/meta.xml index ea83417f0..cc40b43f6 100644 --- a/install/langs/no/data/meta.xml +++ b/install/langs/no/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Bestillingsdetaljer + + + bestillingsdetaljer + Identity diff --git a/install/langs/pl/data/meta.xml b/install/langs/pl/data/meta.xml index 05396fe96..0b62baf89 100644 --- a/install/langs/pl/data/meta.xml +++ b/install/langs/pl/data/meta.xml @@ -96,6 +96,12 @@ historia-zamowien + + Szczegóły rezerwacji + + + szczegoly-rezerwacji + Dane osobiste diff --git a/install/langs/pt/data/meta.xml b/install/langs/pt/data/meta.xml index bbe225230..0fbfef774 100644 --- a/install/langs/pt/data/meta.xml +++ b/install/langs/pt/data/meta.xml @@ -96,6 +96,12 @@ historico-de-encomendas + + Detalhe da reserva + + + detalhe-da-reserva + Identidade diff --git a/install/langs/qc/data/meta.xml b/install/langs/qc/data/meta.xml index 29ed00b90..dd3c5eabd 100644 --- a/install/langs/qc/data/meta.xml +++ b/install/langs/qc/data/meta.xml @@ -96,6 +96,12 @@ historique-commandes + + Détail de la réservation + + + detail-de-la-reservation + Identité diff --git a/install/langs/ro/data/meta.xml b/install/langs/ro/data/meta.xml index fc4495f8e..74eb40996 100644 --- a/install/langs/ro/data/meta.xml +++ b/install/langs/ro/data/meta.xml @@ -96,6 +96,12 @@ istoric-comenzi + + Detalii rezervare + + + detalii-rezervare + Identitate diff --git a/install/langs/ru/data/meta.xml b/install/langs/ru/data/meta.xml index b6f357100..60eb00227 100644 --- a/install/langs/ru/data/meta.xml +++ b/install/langs/ru/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Детали бронирования + + + detali-bronirovaniya + Идентификация diff --git a/install/langs/si/data/meta.xml b/install/langs/si/data/meta.xml index 4178d2d38..8071183e7 100644 --- a/install/langs/si/data/meta.xml +++ b/install/langs/si/data/meta.xml @@ -96,6 +96,12 @@ order-history + + ගිතේරිම් විස්තර + + + githerims-wisthara + Identity diff --git a/install/langs/sr/data/meta.xml b/install/langs/sr/data/meta.xml index ea83417f0..c59bfba2c 100644 --- a/install/langs/sr/data/meta.xml +++ b/install/langs/sr/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Detalji rezervacije + + + detalji-rezervacije + Identity diff --git a/install/langs/sv/data/meta.xml b/install/langs/sv/data/meta.xml index 4178d2d38..b51c88dce 100644 --- a/install/langs/sv/data/meta.xml +++ b/install/langs/sv/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Bokningsinformation + + + bokningsinformation + Identity diff --git a/install/langs/tw/data/meta.xml b/install/langs/tw/data/meta.xml index bc57164f3..f7daa4372 100644 --- a/install/langs/tw/data/meta.xml +++ b/install/langs/tw/data/meta.xml @@ -96,6 +96,12 @@ order-history + + 預訂明細 + + + yùdìng-míngxi + 識別 diff --git a/install/langs/vn/data/meta.xml b/install/langs/vn/data/meta.xml index ce67d2da2..432f3d828 100644 --- a/install/langs/vn/data/meta.xml +++ b/install/langs/vn/data/meta.xml @@ -96,6 +96,12 @@ order-history + + Chi tiết đặt phòng + + + chi-tiet-dat-phong + Identity diff --git a/install/langs/zh/data/meta.xml b/install/langs/zh/data/meta.xml index ea83417f0..702769a56 100644 --- a/install/langs/zh/data/meta.xml +++ b/install/langs/zh/data/meta.xml @@ -96,6 +96,12 @@ order-history + + 预订详情 + + + yùdìng-xiángqíng + Identity diff --git a/install/theme/view.css b/install/theme/view.css index 6ec09c8b0..1d135b54d 100644 --- a/install/theme/view.css +++ b/install/theme/view.css @@ -841,7 +841,6 @@ ul#optional_update li.ok { vertical-align: middle; font-size: 13px; zoom: 1; - *display: inline; -webkit-user-select: none; -moz-user-select: none; user-select: none; @@ -1269,27 +1268,27 @@ ul#optional_update li.ok { .btn-facebook, .btn-twitter, .btn-google-plus, .btn-pinterest, .btn-linkedin { color: #333333; background-color: white; border: solid 1px #333333; display: inline-block; margin-bottom: 0; font-weight: normal; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; padding: 4px 8px 4px 4px; font-size: 13px; line-height: 32px; -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } .btn-facebook:hover, .btn-facebook:focus, .btn-facebook:active, .btn-twitter:hover, .btn-twitter:focus, .btn-twitter:active, .btn-google-plus:hover, .btn-google-plus:focus, .btn-google-plus:active, .btn-pinterest:hover, .btn-pinterest:focus, .btn-pinterest:active, .btn-linkedin:hover, .btn-linkedin:focus, .btn-linkedin:active { color: white; } -.btn-facebook i, .btn-twitter i, .btn-google-plus i, .btn-pinterest i, .btn-linkedin i { vertical-align: middle; display: inline-block; height: 32px; width: 32px; margin-right: 4px; background: url('data:image/png;base64,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') no-repeat; } +.btn-facebook i, .btn-twitter i, .btn-google-plus i, .btn-pinterest i, .btn-linkedin i { vertical-align: middle; display: inline-block; height: 28px; width: 28px; margin-right: 4px; background: url('data:image/png;base64,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') no-repeat; } -.btn-facebook i { background-position: -128px 0; } +.btn-facebook i { background-position: -26px 0; } .btn-facebook:hover { background-color: #435f9f; } -.btn-facebook:hover i { background-position: -128px -32px; } +.btn-facebook:hover i { background-position: -26px -26px; } -.btn-twitter i { background-position: -64px 0; } -.btn-twitter:hover { background-color: #00aaf0; } -.btn-twitter:hover i { background-position: -64px -32px; } +.btn-twitter i { background-position: 0 0; } +.btn-twitter:hover { background-color: #000000; } +.btn-twitter:hover i { background-position: 0 -26px; } -.btn-google-plus i { background-position: 0 0; } +/* .btn-google-plus i { background-position: 0 0; } .btn-google-plus:hover { background-color: #e04b34; } -.btn-google-plus:hover i { background-position: 0 -32px; } +.btn-google-plus:hover i { background-position: 0 -26px; } */ -.btn-pinterest i { background-position: -96px 0; } +/* .btn-pinterest i { background-position: -96px 0; } .btn-pinterest:hover { background-color: #ce1f21; } -.btn-pinterest:hover i { background-position: -94px -32px; } +.btn-pinterest:hover i { background-position: -94px -26px; } */ -.btn-linkedin i { background-position: -32px 0; } +.btn-linkedin i { background-position: -52px 0; } .btn-linkedin:hover { background-color: #0a86bf; } -.btn-linkedin:hover i { background-position: -32px -32px; } +.btn-linkedin:hover i { background-position: -52px -26px; } /* for qloapps view changes */ a.wk-service-link { diff --git a/install/theme/views/footer.phtml b/install/theme/views/footer.phtml index 646d5729c..44dc055c7 100644 --- a/install/theme/views/footer.phtml +++ b/install/theme/views/footer.phtml @@ -22,7 +22,7 @@
-