Merge branch 'develop' into gli-340

admin/themes/default/sass/controllers/_dashboard.sass

@@ -132,69 +132,11 @@
 		.data_value
 			display: block
 			text-align: center
-
-	#dashtrends
-		header
-			margin-bottom: 0
-		#dashtrends_toolbar
-			margin: 0 -16px 10px
-			dl
-				@include box-shadow(0 0 0 2px white inset)
-				dt
-					color: #777
-					padding: 0
-					margin: 0
-					height: 2.6em
-				dd.data_value
-					color: #aaa
-					@extend .clearfix
-					small
-						font-size: 0.5em
-				dd.dash_trend
-					background-color: white
-					width: 80px
-					margin: 0 auto
-					@include border-radius(3px)
-				&:hover
-					dt, dd.data_value
-						color: $brand-primary
-					dt
-						text-decoration: underline
-				&.active
-					dt, dd.data_value
-						color: white
-		dl
-			cursor: pointer
-			margin: 0
-			min-height: 70px
-			text-align: center
-			background-color: white
-			padding: 10px
-			border-bottom: 1px solid #ddd
-			@include border-left(1px solid #ddd)
-			&:first-child
-				@include border-left(none)
-			&.active
-				background-color: $brand-primary
-				@include box-shadow(white 0 0 0 2px inset)
-				dt
-					color: white
-		dt
-			text-align: center
-			height: 37px
-			line-height: 1em
-			font: 400 1.1em/120% $headings-font-family
-		dd
-			span
-				font-size: 0.9em
-				white-space: nowrap
-		svg
-			height: 350px
 
 	#dashgoals
 		svg
 			height: 250px
-			
+
 	#dashproducts
 		nav
 			margin-bottom: 10px

admin/themes/default/template/controllers/backup/download/view.tpl

@@ -45,8 +45,8 @@
 			<button data-dismiss="alert" class="close" type="button">×</button>
 			<p>{l s='Disclaimer before creating a new backup'}</p>
 			<ol>
-				<li>{l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}</li>
-				<li>{l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}</li>
+				<li>{l s='QloApps is not responsible for your database, its backups and/or recovery.'}</li>
+				<li>{l s='QloApps is open-source software. You are using it at your own risk under the license agreement.'}</li>
 				<li>{l s='You should back up your data on a regular basis (both files and database).'}</li>
 				<li>{l s='This function only backs up your database, not your files.'}</li>
 				<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
@@ -68,7 +68,7 @@
 		<div class="alert alert-info">
 			<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
 			<ol>
-				<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
+				<li>{l s='Set "Enable Site" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
 				<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
 				<li>{l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}</li>
 				<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>

admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl

@@ -47,8 +47,8 @@
 			<button data-dismiss="alert" class="close" type="button">×</button>
 			<h4>{l s='Disclaimer before creating a new backup'}</h4>
 			<ol>
-				<li>{l s='Qloapps is not responsible for your database, its backups and/or recovery.'}</li>
-				<li>{l s='Qloapps is open-source software. You are using it at your own risk under the license agreement.'}</li>
+				<li>{l s='QloApps is not responsible for your database, its backups and/or recovery.'}</li>
+				<li>{l s='QloApps is open-source software. You are using it at your own risk under the license agreement.'}</li>
 				<li>{l s='You should back up your data on a regular basis (both files and database).'}</li>
 				<li>{l s='This function only backs up your database, not your files.'}</li>
 				<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>

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

@@ -98,7 +98,7 @@
 		<p class="radio">
 			<label for="apply_discount_to_selection">
 				<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2} checked="checked"{/if}{if $product_rule_groups|@count == 0}disabled="disabled"{/if} />
-				{l s='Selected Room Type(s)'}{if $product_rule_groups|@count == 0}&nbsp;<span id="apply_discount_to_selection_warning" class="text-muted clearfix"><i class="icon-warning-sign"></i> <a href="#" id="apply_discount_to_selection_shortcut">{l s='You must select some room types before'}</a></span>{/if}
+				{l s='Selected Room Type(s)'}{if $product_rule_groups|@count == 0}&nbsp;<span id="apply_discount_to_selection_warning" class="text-muted clearfix"><i class="icon-warning-sign"></i> <a href="#" id="apply_discount_to_selection_shortcut">{l s='You must select some room types first'}</a></span>{/if}
 			</label>
 		</p>
 	</div>

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

@@ -334,7 +334,7 @@
 			{if count($interested)}
 			<div class="panel">
 				<div class="panel-heading">
-					<i class="icon-eye"></i> {l s='Viewed products'} <span class="badge">{count($interested)}</span>
+					<i class="icon-eye"></i> {l s='Viewed room types'} <span class="badge">{count($interested)}</span>
 				</div>
 				<table class="table">
 					<thead>

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

@@ -33,61 +33,110 @@
 <div id="dashboard">
 	{$hookDashboardTop}
 	<div class="row">
+		{if $warning}
+			<div class="col-lg-12">
+				<div class="alert alert-warning">{$warning}</div>
+			</div>
+		{/if}
 		<div class="col-lg-12">
-{if $warning}
-			<div class="alert alert-warning">{$warning}</div>
-{/if}
-			<div id="calendar" class="panel">
-				<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
-					<div class="btn-group">
-						<button type="button" name="submitDateDay" class="btn btn-default submitDateDay{if (!isset($preselect_date_range) || !$preselect_date_range) || (isset($preselect_date_range) && $preselect_date_range == 'day')} active{/if}">
-							{l s='Day'}
-						</button>
-						<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth {if isset($preselect_date_range) && $preselect_date_range == 'month'}active{/if}">
-							{l s='Month'}
-						</button>
-						<button type="button" name="submitDateYear" class="btn btn-default submitDateYear{if isset($preselect_date_range) && $preselect_date_range == 'year'} active{/if}">
-							{l s='Year'}
-						</button>
-						<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-day'} active{/if}">
-							{l s='Day'}-1
-						</button>
-						<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-month'} active{/if}">
-							{l s='Month'}-1
-						</button>
-						<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-year'} active{/if}">
-							{l s='Year'}-1
-						</button>
-					</div>
-					<input type="hidden" name="datepickerFrom" id="datepickerFrom" value="{$date_from|escape}" class="form-control">
-					<input type="hidden" name="datepickerTo" id="datepickerTo" value="{$date_to|escape}" class="form-control">
-					<input type="hidden" name="preselectDateRange" id="preselectDateRange" value="{if isset($preselect_date_range)}{$preselect_date_range}{/if}" class="form-control">
-					<div class="form-group pull-right">
-						<button id="datepickerExpand" class="btn btn-default" type="button">
-							<i class="icon-calendar-empty"></i>
-							<span class="hidden-xs">
-								{l s='From'}
-								<strong class="text-info" id="datepicker-from-info">{$date_from|escape}</strong>
-								{l s='To'}
-								<strong class="text-info" id="datepicker-to-info">{$date_to|escape}</strong>
-								<strong class="text-info" id="datepicker-diff-info"></strong>
-							</span>
-							<i class="icon-caret-down"></i>
-						</button>
-						{$calendar}
+			<div class="panel clearfix">
+				<div class="col-lg-6">
+					<div id="calendar">
+						<form action="{$action|escape}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
+							<div class="btn-toolbar">
+								<div class="btn-group input-group">
+									<button type="button" name="submitDateDay" class="btn btn-default submitDateDay{if (!isset($preselect_date_range) || !$preselect_date_range) || (isset($preselect_date_range) && $preselect_date_range == 'day')} active{/if}">
+										{l s='Day'}
+									</button>
+									<button type="button" name="submitDateMonth" class="btn btn-default submitDateMonth {if isset($preselect_date_range) && $preselect_date_range == 'month'}active{/if}">
+										{l s='Month'}
+									</button>
+									<button type="button" name="submitDateYear" class="btn btn-default submitDateYear{if isset($preselect_date_range) && $preselect_date_range == 'year'} active{/if}">
+										{l s='Year'}
+									</button>
+									<button type="button" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-day'} active{/if}">
+										{l s='Day'}-1
+									</button>
+									<button type="button" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-month'} active{/if}">
+										{l s='Month'}-1
+									</button>
+									<button type="button" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev{if isset($preselect_date_range) && $preselect_date_range == 'prev-year'} active{/if}">
+										{l s='Year'}-1
+									</button>
+								</div>
+								<input type="hidden" name="datepickerFrom" id="datepickerFrom" value="{$date_from|escape}" class="form-control">
+								<input type="hidden" name="datepickerTo" id="datepickerTo" value="{$date_to|escape}" class="form-control">
+								<input type="hidden" name="preselectDateRange" id="preselectDateRange" value="{if isset($preselect_date_range)}{$preselect_date_range}{/if}" class="form-control">
+								<div class="form-group input-group">
+									<button id="datepickerExpand" class="btn btn-default" type="button">
+										<i class="icon-calendar-empty"></i>
+										<span class="hidden-xs">
+											{l s='From'}
+											<strong class="text-info" id="datepicker-from-info">{$date_from|escape}</strong>
+											{l s='To'}
+											<strong class="text-info" id="datepicker-to-info">{$date_to|escape}</strong>
+											<strong class="text-info" id="datepicker-diff-info"></strong>
+										</span>
+										<i class="icon-caret-down"></i>
+									</button>
+									{$calendar}
+								</div>
+							</div>
+						</form>
 					</div>
-				</form>
+				</div>
+				<div class="col-lg-6">
+					<form action="{$action|escape}" method="post" class="form-inline">
+						<div class="text-right">
+							<select class="form-control stats-filter-hotel" name="stats_id_hotel">
+								{foreach from=$hotel_options item=hotel_option}
+									<option value="{$hotel_option.id_hotel}" {if $hotel_option.id_hotel == $id_hotel}selected{/if}>
+										{$hotel_option.hotel_name|escape:'html':'UTF-8'}
+									</option>
+								{/foreach}
+							</select>
+							<input type="hidden" id="submit-stats-hotel" name="submitStatsHotel" value="1" disabled>
+						</div>
+					</form>
+				</div>
 			</div>
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-md-4 col-lg-3" id="hookDashboardZoneOne">
-			{$hookDashboardZoneOne}
-		</div>
-		<div class="col-md-8 col-lg-9" id="hookDashboardZoneTwo">
+		<div class="col-md-8 col-md-push-4 col-lg-7 col-lg-push-3" id="hookDashboardZoneTwo">
 			<div class='row'>
 				{$hookDashboardZoneTwo}
 			</div>
 		</div>
+		<div class="col-md-4 col-md-pull-8 col-lg-3 col-lg-pull-7" id="hookDashboardZoneOne">
+			{$hookDashboardZoneOne}
+		</div>
+		<div class="col-md-4 col-md-pull-8 col-lg-2 col-lg-pull-0" id="hookDashboardZoneThree">
+			<div class="row">
+				{$hookDashboardZoneThree}
+				<div class="col-sm-12">
+					<section class="dash_links widget panel">
+						<h3><i class="icon-link"></i> {l s="Useful links"}</h3>
+							<dl>
+								<dt><a href="https://qloapps.com/qlo-reservation-system/" class="_blank">{l s="Official Documentation"}</a></dt>
+								<dd>{l s="Qloapps User Guide"}</dd>
+							</dl>
+							<dl>
+								<dt><a href="https://forums.qloapps.com/" class="_blank">{l s="Qloapps Forum"}</a></dt>
+								<dd>{l s="Connect with the Qloapps community"}</dd>
+							</dl>
+							<dl>
+								<dt><a href="https://qloapps.com/addons/" class="_blank">{l s="Qloapps Addons"}</a></dt>
+								<dd>{l s="Enhance your store Qloapps modules"}</dd>
+							</dl>
+							<dl>
+								<dt><a href="https://qloapps.com/contact/" class="_blank">{l s="Contact Us!"}</a></dt>
+								<dd>{l s="Contact us for any help"}</dd>
+							</dl>
+					</section>
+				</div>
+			</div>
+		</div>
+
 	</div>
 </div>

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

@@ -138,13 +138,13 @@
 			<div class="panel">
 				<h3>
 					<i class="icon-info"></i>
-					{l s='Store information'}
+					{l s='Website information'}
 				</h3>
 				<p>
-					<strong>{l s='Qloapps version:'}</strong> {$shop.qloappsV|escape:'html':'UTF-8'}
+					<strong>{l s='QloApps version:'}</strong> {$shop.qloappsV|escape:'html':'UTF-8'}
 				</p>
 				<p>
-					<strong>{l s='Shop URL:'}</strong> {$shop.url|escape:'html':'UTF-8'}
+					<strong>{l s='Website URL:'}</strong> {$shop.url|escape:'html':'UTF-8'}
 				</p>
 				<p>
 					<strong>{l s='Current theme in use:'}</strong> {$shop.theme|escape:'html':'UTF-8'}

admin/themes/default/template/controllers/modules/page.tpl

@@ -24,7 +24,7 @@
 *}
 <div class="alert bg-info">
 	<div class="row modules-addons-info">
-		<h4>{l s='Explore all addon of Qloapps '}<a class="btn btn-default _blank" href="https://qloapps.com/addons/"> @{l s='Qloapps addons'}</a></h4>
+		<h4>{l s='Explore all QloApps addons'} <a class="btn btn-default _blank" href="https://qloapps.com/addons/"> {l s='QloApps addons'}</a></h4>
 	</div>
 </div>
 {$kpis}

admin/themes/default/template/controllers/products/informations.tpl

@@ -451,7 +451,7 @@
 	</div>
 	{/if}
 
-	<div class="form-group">
+	{* <div class="form-group">
 		<label class="control-label col-lg-3" for="tags_{$id_lang}">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Will be displayed in the tags block when enabled. Tags help customers easily find your room types.'}">
@@ -505,7 +505,7 @@
 			<div class="help-block">{l s='Each tag has to be followed by a comma. The following characters are forbidden: %s' sprintf='!&lt;;&gt;;?=+#&quot;&deg;{}_$%.'}
 			</div>
 		</div>
-	</div>
+	</div> *}
 	<div class="panel-footer">
 		<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default"><i class="process-icon-cancel"></i> {l s='Cancel'}</a>
 		<button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save'}</button>

admin/themes/default/template/controllers/products/prices.tpl

@@ -580,15 +580,6 @@ $(document).ready(function () {
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="control-label col-lg-2" for="sp_from_quantity">{l s='Starting at'}</label>
-				<div class="col-lg-4">
-					<div class="input-group">
-						<span class="input-group-addon">{l s='unit'}</span>
-						<input type="text" name="sp_from_quantity" id="sp_from_quantity" value="1" />
-					</div>
-				</div>
-			</div>
 			<div class="form-group">
 				<label class="control-label col-lg-2" for="sp_price">{l s='Room type price'}
 					{if $country_display_tax_label}
@@ -732,7 +723,6 @@ $(document).ready(function () {
 				{/if}
 				<th>{l s='Impact'}</th>
 				<th>{l s='Period'}</th>
-				<th>{l s='From (quantity)'}</th>
 				<th>{l s='Action'}</th>
 			</tr>
 		</thead>

admin/themes/default/template/controllers/translations/helpers/view/main.tpl

@@ -79,7 +79,7 @@
 				{l s='Modify translations'}
 			</h3>
 			<p class="alert alert-info">
-				{l s='Here you can modify translations for every line of text inside Qloapps.'}<br />
+				{l s='Here you can modify translations for every line of text inside QloApps.'}<br />
 				{l s='First, select a type of translation (such as "Back office" or "Installed modules"), and then select the language you want to translate strings in.'}
 			</p>
 			<div class="form-group">
@@ -136,7 +136,7 @@
 			</h3>
 			<div id="submitAddLangContent" class="form-group">
 				<p class="alert alert-info">
-					{l s='You can add or update a language directly from the Qloapps website here.'}<br/>
+					{l s='You can add or update a language directly from the QloApps website here.'}<br/>
 					{l s='If you choose to update an existing language pack, all of your previous customizations in the theme named "hotel-reservation-theme" will be lost. This includes front office expressions and default email templates.'}
 				</p>
 				{if $packs_to_update || $packs_to_install}
@@ -161,7 +161,7 @@
 					</div>
 
 				{else}
-					<p class="text-danger">{l s='Cannot connect to the Qloapps website to get the language list.'}</p>
+					<p class="text-danger">{l s='Cannot connect to the QloApps website to get the language list.'}</p>
 				{/if}
 			</div>
 			<div class="panel-footer">

admin/themes/default/template/header.tpl

@@ -297,9 +297,9 @@
 {/if}
 				<ul id="header_employee_box">
 					<li class="hidden-sm hidden-xs">
-						<a target="_blank" href="https://qloapps.com/addons/" class="toolbar_btn" title="{l s='Explore Qloapps Addons'}">
+						<a target="_blank" href="https://qloapps.com/addons/" class="toolbar_btn" title="{l s='Explore QloApps Addons'}">
 							<i class="icon-chain-broken"></i>
-							{l s='Explore Qloapps Addons'}
+							{l s='Explore QloApps Addons'}
 						</a>
 					</li>
 					{if {$base_url}}