diff --git a/.gitignore b/.gitignore
index ae0a05c8f..9ce95681a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ composer.lock
img/**
!/img/404.gif
+!/img/.htaccess
!/img/admin/
!/img/admin/*.gif
!/img/admin/*.png
diff --git a/admin/backups/.htaccess b/admin/backups/.htaccess
index 93169e4eb..3de9e4008 100644
--- a/admin/backups/.htaccess
+++ b/admin/backups/.htaccess
@@ -1,2 +1,10 @@
-Order deny,allow
-Deny from all
+# Apache 2.2
+
+ Order deny,allow
+ Deny from all
+
+
+# Apache 2.4
+
+ Require all denied
+
diff --git a/admin/export/.htaccess b/admin/export/.htaccess
index 93169e4eb..3de9e4008 100644
--- a/admin/export/.htaccess
+++ b/admin/export/.htaccess
@@ -1,2 +1,10 @@
-Order deny,allow
-Deny from all
+# Apache 2.2
+
+ Order deny,allow
+ Deny from all
+
+
+# Apache 2.4
+
+ Require all denied
+
diff --git a/admin/import/.htaccess b/admin/import/.htaccess
index 93169e4eb..3de9e4008 100644
--- a/admin/import/.htaccess
+++ b/admin/import/.htaccess
@@ -1,2 +1,10 @@
-Order deny,allow
-Deny from all
+# Apache 2.2
+
+ Order deny,allow
+ Deny from all
+
+
+# Apache 2.4
+
+ Require all denied
+
diff --git a/admin/tabs/.htaccess b/admin/tabs/.htaccess
index 93169e4eb..3de9e4008 100644
--- a/admin/tabs/.htaccess
+++ b/admin/tabs/.htaccess
@@ -1,2 +1,10 @@
-Order deny,allow
-Deny from all
+# Apache 2.2
+
+ Order deny,allow
+ Deny from all
+
+
+# Apache 2.4
+
+ Require all denied
+
diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass
index c5315218e..d061c8615 100644
--- a/admin/themes/default/sass/controllers/_order.sass
+++ b/admin/themes/default/sass/controllers/_order.sass
@@ -77,3 +77,9 @@
.room_status_info_form
.room_status
white-space: normal
+
+#noteContent
+ max-height: 200px
+
+.panel-refund-request .refunded_amount
+ margin-top: 2px
\ No newline at end of file
diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss
index 8240fa4ad..a126c3986 100644
--- a/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss
+++ b/admin/themes/default/sass/vendor/bootstrap-sass/_modals.scss
@@ -9,7 +9,7 @@
// Kill the scroll on the body
.modal-open {
- overflow-x: hidden;
+ overflow: hidden;
}
// Container that the modal scrolls within
diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl
index ec102910d..9fd0f69e6 100644
--- a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -29,31 +29,29 @@
{if $input.name == 'vat_number'}
{/if}
-
- {if $input.type == 'text_customer' && !isset($customer)}
-
- {else}
- {$smarty.block.parent}
- {/if}
+ {$smarty.block.parent}
{/block}
-{block name="field"}
+{block name="input"}
{if $input.type == 'text_customer'}
{if isset($customer)}
-
+
+ {$customer->lastname} {$customer->firstname} ({$customer->email})
+
- {else}
-
-
-
-
-
-
- {/if}
+ function resetCustomerRelatedAddressFields() {
+ $('input[name=firstname]').val('');
+ $('input[name=lastname]').val('');
+ $('input[name=company]').val('');
+ $('input[name=id_customer]').val('');
+ }
+
{else}
{$smarty.block.parent}
{/if}
diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
index 88da2734e..18145ce07 100644
--- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -146,15 +146,27 @@
- {if $customer->active}
-
-
- {l s='Active'}
+ {if !$customer->deleted}
+ {if $customer->active}
+
+
+ {l s='Active'}
+
+ {else}
+
+
+ {l s='Inactive'}
+
+ {/if}
+ {elseif $customer->deleted == Customer::STATUS_BANNED}
+
+
+ {l s='Banned'}
- {else}
+ {elseif $customer->deleted == Customer::STATUS_DELETED}
- {l s='Inactive'}
+ {l s='Deleted'}
{/if}
diff --git a/admin/themes/default/template/controllers/login/header.tpl b/admin/themes/default/template/controllers/login/header.tpl
index aff412764..d1d17ce21 100644
--- a/admin/themes/default/template/controllers/login/header.tpl
+++ b/admin/themes/default/template/controllers/login/header.tpl
@@ -39,7 +39,7 @@
- {$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}>{/if} {$meta_title}{/if} (PrestaShop™)
+ {$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}>{/if} {$meta_title}{/if} (QloApps™)
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
index fb6f389c2..07f87ca73 100644
--- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
+++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
@@ -92,7 +92,7 @@
{foreach $data['child_ages'] as $childAge}