-
-
- {if isset($icon) && $icon}
-
- {if $subtitle}
-
-
- {$subtitle|escape}
+ {if isset($icon) && $icon}
+
+
+
+ {$title|escape}
- {/if}
-
- {if isset($chart) && $chart}
-
-
-
+ {if $subtitle}
+
+
+ {$subtitle|escape}
+
+
+ {/if}
- {/if}
-
- {if isset($source) && $source}
-
- {elseif isset($value) && $value !== ''}
-
{$value|escape:'html':'UTF-8'}
+ {if isset($chart) && $chart}
+
+ {/if}
+
+ {if isset($source) && $source}
+ {$value|escape:'html':'UTF-8'}
+ {/if}
+
+ {if isset($href) && $href}
+
{/if}
- {if isset($href) && $href}
-
- {/if}
-
{if isset($source) && $source}
diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl
index 3b180415e..b3e7b84ad 100644
--- a/admin/themes/default/template/helpers/list/list_header.tpl
+++ b/admin/themes/default/template/helpers/list/list_header.tpl
@@ -295,28 +295,30 @@
{$params['title']|escape:'html':'UTF-8'}
diff --git a/classes/Cart.php b/classes/Cart.php
index 6bd68b361..8401a36b9 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -2380,7 +2380,6 @@ class CartCore extends ObjectModel
$array = array();
foreach($selectedServiceProducts as $selectedProduct) {
if (isset($array[$selectedProduct['id_hotel']])) {
- $array[$selectedProduct['id_hotel']]['quantity'] += $selectedProduct['quantity'];
$array[$selectedProduct['id_hotel']]['total_price_tax_excl'] += $selectedProduct['total_price_tax_excl'];
$array[$selectedProduct['id_hotel']]['total_price_tax_incl'] += $selectedProduct['total_price_tax_incl'];
} else {
diff --git a/classes/Cookie.php b/classes/Cookie.php
index 0edb66672..90dbc9509 100644
--- a/classes/Cookie.php
+++ b/classes/Cookie.php
@@ -89,8 +89,9 @@ class CookieCore
$this->_path = '/'.$this->_path;
}
$this->_path = rawurlencode($this->_path);
- $this->_path = str_replace('%2F', '/', $this->_path);
- $this->_path = str_replace('%7E', '~', $this->_path);
+ $search = array('%2F', '%7E', '%28', '%29', '%2B', '%26');
+ $replace = array('/', '~', '(', ')', '+', '&');
+ $this->_path = str_replace($search, $replace, $this->_path);
$this->_domain = $this->getDomain($shared_urls);
$this->_sameSite = Configuration::get('PS_COOKIE_SAMESITE');
$this->_name = 'QloApps-'.md5(($this->_standalone ? '' : _PS_VERSION_).$name.$this->_domain);
diff --git a/classes/CustomerThread.php b/classes/CustomerThread.php
index b6ec27283..70db8c507 100644
--- a/classes/CustomerThread.php
+++ b/classes/CustomerThread.php
@@ -140,14 +140,15 @@ class CustomerThreadCore extends ObjectModel
return Db::getInstance()->executeS($sql);
}
- public static function getIdCustomerThreadByEmailAndIdOrder($email, $id_order)
+ public static function getIdCustomerThreadByEmailAndIdOrder($email, $id_order, $id_contact = false)
{
return Db::getInstance()->getValue('
SELECT cm.id_customer_thread
FROM '._DB_PREFIX_.'customer_thread cm
WHERE cm.email = \''.pSQL($email).'\'
AND cm.id_shop = '.(int)Context::getContext()->shop->id.'
- AND cm.id_order = '.(int)$id_order
+ AND cm.id_order = '.(int)$id_order.' '.
+ (($id_contact) ? ' AND cm.id_contact='.(int) $id_contact : ' ')
);
}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index f0550e020..2b66db47f 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -844,13 +844,13 @@ class AdminControllerCore extends Controller
$this->ensureListIdDefinition();
$prefix = $this->getCookieFilterPrefix();
-
+ $filters = array();
if (isset($this->list_id)) {
foreach ($_POST as $key => $value) {
if ($value === '') {
unset($this->context->cookie->{$prefix.$key});
} elseif (stripos($key, $this->list_id.'Filter_') === 0) {
- $this->context->cookie->{$prefix.$key} = !is_array($value) ? $value : json_encode($value);
+ $filters[$prefix.$key] = !is_array($value) ? $value : json_encode($value);
} elseif (stripos($key, 'submitFilter') === 0) {
$this->context->cookie->$key = !is_array($value) ? $value : json_encode($value);
}
@@ -858,7 +858,7 @@ class AdminControllerCore extends Controller
foreach ($_GET as $key => $value) {
if (stripos($key, $this->list_id.'Filter_') === 0) {
- $this->context->cookie->{$prefix.$key} = !is_array($value) ? $value : json_encode($value);
+ $filters[$prefix.$key] = !is_array($value) ? $value : json_encode($value);
} elseif (stripos($key, 'submitFilter') === 0) {
$this->context->cookie->$key = !is_array($value) ? $value : json_encode($value);
}
@@ -866,65 +866,36 @@ class AdminControllerCore extends Controller
if ($value === '' || $value == $this->_defaultOrderBy) {
unset($this->context->cookie->{$prefix.$key});
} else {
- $this->context->cookie->{$prefix.$key} = $value;
+ $filters[$prefix.$key] = $value;
}
} elseif (stripos($key, $this->list_id.'Orderway') === 0 && Validate::isOrderWay($value)) {
if ($value === '' || $value == $this->_defaultOrderWay) {
unset($this->context->cookie->{$prefix.$key});
} else {
- $this->context->cookie->{$prefix.$key} = $value;
+ $filters[$prefix.$key] = $value;
}
}
}
}
- $filters = $this->context->cookie->getFamily($prefix.$this->list_id.'Filter_');
- $definition = false;
- if (isset($this->className) && $this->className) {
- $definition = ObjectModel::getDefinition($this->className);
+ if (empty($filters)) {
+ $filters = $this->context->cookie->getFamily($prefix.$this->list_id.'Filter_');
}
foreach ($filters as $key => $value) {
- /* Extracting filters from $_POST on key filter_ */
- if ($value != null && !strncmp($key, $prefix.$this->list_id.'Filter_', 7 + Tools::strlen($prefix.$this->list_id))) {
- $key_org = $key;
- $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
- /* Table alias could be specified using a ! eg. alias!field */
- $tmp_tab = explode('!', $key);
- $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
-
- if ($field = $this->filterToField($key, $filter)) {
- $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
- if ((($type == 'date' || $type == 'datetime' || $type == 'range') || ($type == 'select' && (isset($field['multiple']) && $field['multiple'])))
- && is_string($value)
- ) {
- $value = json_decode($value, true);
+ $key_org = $key;
+ $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
+ /* Table alias could be specified using a ! eg. alias!field */
+ $tmp_tab = explode('!', $key);
+ $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
+ if ($field = $this->filterToField($key, $filter)) {
+ $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
+ if (($type == 'date' || $type == 'datetime' || $type == 'range')) {
+ if (is_string($value)) {
+ $filter_value = json_decode($value, true);
}
- $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';
-
- // as in database 0 means position 1 in the renderlist
- if (isset($field['position']) && Validate::isInt($value)) {
- $value -= 1;
- }
-
- // Assignment by reference
- if (array_key_exists('tmpTableFilter', $field)) {
- $sql_filter = & $this->_tmpTableFilter;
- } elseif (array_key_exists('havingFilter', $field)) {
- $sql_filter = & $this->_filterHaving;
- } else {
- $sql_filter = & $this->_filter;
- }
-
- if (is_array($value)) {
- if ($type == 'select' && (isset($field['multiple']) && $field['multiple']) && isset($field['operator'])) {
- if ($field['operator'] == 'and') {
- $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
- $this->_filterHaving .= ' AND COUNT(DISTINCT '.pSQL($key).') = '.(int) count($value);
- } elseif ($field['operator'] == 'or') {
- $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
- }
- } elseif ($type == 'range') {
+ if (is_array($filter_value)) {
+ if ($type == 'range') {
// set validation type
if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) {
$validation = $field['validation'];
@@ -932,57 +903,120 @@ class AdminControllerCore extends Controller
$validation = 'isUnsignedInt';
}
- if (isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) {
- if (!Validate::$validation($value[0])) {
- $this->errors[] = Tools::displayError('The \'From\' value is invalid');
- } else {
- $sql_filter .= ' AND '.pSQL($key).' >= '.pSQL($value[0]);
+ if (isset($filter_value[0]) && ($filter_value[0] !== '' || $filter_value[0] === 0)) {
+ if (!Validate::$validation($filter_value[0])) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'From\' value is invalid'), $field['title']);
}
}
- if (isset($value[1]) && ($value[1] !== '' || $value[1] === 0)) {
- if (!Validate::$validation($value[1])) {
- $this->errors[] = Tools::displayError('The \'To\' value is invalid');
- } elseif ((isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) && $value[0] > $value[1]) {
- $this->errors[] = Tools::displayError('The \'To\' value cannot be less than \'From\' value');
- } else {
- $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]);
+ if (isset($filter_value[1]) && ($filter_value[1] !== '' || $filter_value[1] === 0)) {
+ if (!Validate::$validation($filter_value[1])) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' value is invalid'), $field['title']);
+ } elseif ((isset($filter_value[0]) && ($filter_value[0] !== '' || $filter_value[0] === 0)) && $filter_value[0] > $filter_value[1]) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' value cannot be less than \'From\' value'), $field['title']);
}
}
} else {
- if (isset($value[0]) && !empty($value[0])) {
- if (!Validate::isDate($value[0])) {
- $this->errors[] = Tools::displayError('The \'From\' date format is invalid (YYYY-MM-DD)');
- } else {
- $sql_filter .= ' AND '.pSQL($key).' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
+ if (isset($filter_value[0]) && !empty($filter_value[0])) {
+ if (!Validate::isDate($filter_value[0])) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'From\' date format is invalid (YYYY-MM-DD)'), $field['title']);
}
}
- if (isset($value[1]) && !empty($value[1])) {
- if (!Validate::isDate($value[1])) {
- $this->errors[] = Tools::displayError('The \'To\' date format is invalid (YYYY-MM-DD)');
- } elseif (isset($value[0]) && !empty($value[0]) && strtotime($value[0]) > strtotime($value[1])) {
- $this->errors[] = Tools::displayError('The \'To\' date cannot be earlier than \'From\' date');
- } else {
- $sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
+ if (isset($filter_value[1]) && !empty($filter_value[1])) {
+ if (!Validate::isDate($filter_value[1])) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' date format is invalid (YYYY-MM-DD)'), $field['title']);
+ } elseif (isset($filter_value[0]) && !empty($filter_value[0]) && strtotime($filter_value[0]) > strtotime($filter_value[1])) {
+ $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' date cannot be earlier than \'From\' date'), $field['title']);
}
}
}
- } else {
- $sql_filter .= ' AND ';
- $check_key = ($key == $this->identifier || $key == '`'.$this->identifier.'`');
- $alias = ($definition && !empty($definition['fields'][$filter]['shop'])) ? 'sa' : 'a';
+ }
+ }
+ }
+ }
- if ($type == 'int' || $type == 'bool') {
- $sql_filter .= (($check_key || $key == '`active`') ? $alias.'.' : '').pSQL($key).' = '.(int)$value.' ';
- } elseif ($type == 'decimal') {
- $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = '.(float)$value.' ';
- } elseif ($type == 'select') {
- $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = \''.pSQL($value).'\' ';
- } elseif ($type == 'price') {
- $value = (float)str_replace(',', '.', $value);
- $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = '.pSQL(trim($value)).' ';
- } else {
- $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' LIKE \'%'.pSQL(trim($value)).'%\' ';
+ if (empty($this->errors)) {
+ $definition = false;
+ if (isset($this->className) && $this->className) {
+ $definition = ObjectModel::getDefinition($this->className);
+ }
+ if ($filters) {
+ foreach ($filters as $key => $value) {
+ $this->context->cookie->$key = $value;
+
+ /* Extracting filters from $_POST on key filter_ */
+ if ($value != null && !strncmp($key, $prefix.$this->list_id.'Filter_', 7 + Tools::strlen($prefix.$this->list_id))) {
+ $key_org = $key;
+ $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
+ /* Table alias could be specified using a ! eg. alias!field */
+ $tmp_tab = explode('!', $key);
+ $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
+
+ if ($field = $this->filterToField($key, $filter)) {
+ $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
+ if ((($type == 'date' || $type == 'datetime' || $type == 'range') || ($type == 'select' && (isset($field['multiple']) && $field['multiple'])))
+ && is_string($value)
+ ) {
+ $value = json_decode($value, true);
+ }
+ $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';
+
+ // as in database 0 means position 1 in the renderlist
+ if (isset($field['position']) && Validate::isInt($value)) {
+ $value -= 1;
+ }
+
+ // Assignment by reference
+ if (array_key_exists('tmpTableFilter', $field)) {
+ $sql_filter = & $this->_tmpTableFilter;
+ } elseif (array_key_exists('havingFilter', $field)) {
+ $sql_filter = & $this->_filterHaving;
+ } else {
+ $sql_filter = & $this->_filter;
+ }
+
+ if (is_array($value)) {
+ if ($type == 'select' && (isset($field['multiple']) && $field['multiple']) && isset($field['operator'])) {
+ if ($field['operator'] == 'and') {
+ $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
+ $this->_filterHaving .= ' AND COUNT(DISTINCT '.pSQL($key).') = '.(int) count($value);
+ } elseif ($field['operator'] == 'or') {
+ $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
+ }
+ } elseif ($type == 'range') {
+
+ if (isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) {
+ $sql_filter .= ' AND '.pSQL($key).' >= '.pSQL($value[0]);
+ }
+ if (isset($value[1]) && ($value[1] !== '' || $value[1] === 0)) {
+ $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]);
+ }
+ } else {
+ if (isset($value[0]) && !empty($value[0])) {
+ $sql_filter .= ' AND '.pSQL($key).' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
+ }
+ if (isset($value[1]) && !empty($value[1])) {
+ $sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
+ }
+ }
+ } else {
+ $sql_filter .= ' AND ';
+ $check_key = ($key == $this->identifier || $key == '`'.$this->identifier.'`');
+ $alias = ($definition && !empty($definition['fields'][$filter]['shop'])) ? 'sa' : 'a';
+
+ if ($type == 'int' || $type == 'bool') {
+ $sql_filter .= (($check_key || $key == '`active`') ? $alias.'.' : '').pSQL($key).' = '.(int)$value.' ';
+ } elseif ($type == 'decimal') {
+ $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = '.(float)$value.' ';
+ } elseif ($type == 'select') {
+ $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = \''.pSQL($value).'\' ';
+ } elseif ($type == 'price') {
+ $value = (float)str_replace(',', '.', $value);
+ $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' = '.pSQL(trim($value)).' ';
+ } else {
+ $sql_filter .= ($check_key ? $alias.'.' : '').pSQL($key).' LIKE \'%'.pSQL(trim($value)).'%\' ';
+ }
+ }
}
}
}
@@ -1045,7 +1079,7 @@ class AdminControllerCore extends Controller
if ($this->filter && $this->action != 'reset_filters') {
$this->processFilter();
}
- if (isset($_POST) && count($_POST) && (int)Tools::getValue('submitFilter'.$this->list_id) || Tools::isSubmit('submitReset'.$this->list_id)) {
+ if (empty($this->errors) && isset($_POST) && count($_POST) && (int)Tools::getValue('submitFilter'.$this->list_id) || Tools::isSubmit('submitReset'.$this->list_id)) {
$this->setRedirectAfter(self::$currentIndex.'&token='.$this->token.(Tools::isSubmit('submitFilter'.$this->list_id) ? '&submitFilter'.$this->list_id.'='.(int)Tools::getValue('submitFilter'.$this->list_id) : '').(isset($_GET['id_'.$this->list_id]) ? '&id_'.$this->list_id.'='.(int)$_GET['id_'.$this->list_id] : ''));
}
diff --git a/classes/helper/HelperTreeHotels.php b/classes/helper/HelperTreeHotels.php
index 5849ffb73..dd142943a 100644
--- a/classes/helper/HelperTreeHotels.php
+++ b/classes/helper/HelperTreeHotels.php
@@ -382,6 +382,23 @@ class HelperTreeHotelsCore extends TreeCore
$this->addAction($expand_all);
if ($this->useCheckBox()) {
+ if ($this->useBulkActions()) {
+ $check_all = new TreeToolbarLink(
+ 'Check All',
+ '#',
+ 'checkAllAssociatedHotels($(\'#'.$this->getId().'\'));return false;',
+ 'icon-check-sign');
+ $check_all->setAttribute('id', 'check-all-'.$this->getId());
+ $uncheck_all = new TreeToolbarLink(
+ 'Uncheck All',
+ '#',
+ 'uncheckAllAssociatedHotels($(\'#'.$this->getId().'\'));return false;',
+ 'icon-check-empty');
+ $uncheck_all->setAttribute('id', 'uncheck-all-'.$this->getId());
+ $this->addAction($check_all);
+ $this->addAction($uncheck_all);
+ }
+
$this->setNodeFolderTemplate('tree_node_hotel_folder_checkbox.tpl');
$this->setNodeItemTemplate('tree_node_hotel_item_checkbox.tpl');
$this->setAttribute('use_checkbox', $this->useCheckBox());
diff --git a/classes/module/ModuleGraph.php b/classes/module/ModuleGraph.php
index f087a0a2c..190787bfe 100644
--- a/classes/module/ModuleGraph.php
+++ b/classes/module/ModuleGraph.php
@@ -77,6 +77,7 @@ abstract class ModuleGraphCore extends Module
if (is_callable(array($this, 'setDayValues'))) {
$this->setDayValues($layers);
}
+ $this->_titles['x'][] = $this->l('Time');
}
// If the granularity is inferior to 1 month
// @TODO : change to manage 28 to 31 days
@@ -110,6 +111,7 @@ abstract class ModuleGraphCore extends Module
if (is_callable(array($this, 'setMonthValues'))) {
$this->setMonthValues($layers);
}
+ $this->_titles['x'][] = $this->l('Date');
}
// If the granularity is less than 1 year
elseif (strtotime('-1 year', strtotime($this->_employee->stats_date_to)) < strtotime($this->_employee->stats_date_from)) {
@@ -141,6 +143,7 @@ abstract class ModuleGraphCore extends Module
if (is_callable(array($this, 'setYearValues'))) {
$this->setYearValues($layers);
}
+ $this->_titles['x'][] = $this->l('Month');
}
// If the granularity is greater than 1 year
else {
@@ -163,6 +166,7 @@ abstract class ModuleGraphCore extends Module
if (is_callable(array($this, 'setAllTimeValues'))) {
$this->setAllTimeValues($layers);
}
+ $this->_titles['x'][] = $this->l('Year');
}
}
@@ -210,7 +214,7 @@ abstract class ModuleGraphCore extends Module
if (isset($this->_values[$key])) {
// We don't want strings to be divided. Example: product name
if (is_numeric($this->_values[$key])) {
- $this->_csv .= $this->_values[$key] / (($datas['type'] == 'pie') ? $total : 1);
+ $this->_csv .= $this->_values[$key] * 100 / (($datas['type'] == 'pie') ? $total : 1) . '%';
} else {
$this->_csv .= $this->_values[$key];
}
@@ -220,7 +224,7 @@ abstract class ModuleGraphCore extends Module
} else {
// We don't want strings to be divided. Example: product name
if (is_numeric($this->_values[$i][$key])) {
- $this->_csv .= $this->_values[$i][$key] / (($datas['type'] == 'pie') ? $total : 1);
+ $this->_csv .= $this->_values[$i][$key] * 100 / (($datas['type'] == 'pie') ? $total : 1) . '%';
} else {
$this->_csv .= $this->_values[$i][$key];
}
diff --git a/classes/module/ModuleGrid.php b/classes/module/ModuleGrid.php
index 024066626..13f6f18ee 100644
--- a/classes/module/ModuleGrid.php
+++ b/classes/module/ModuleGrid.php
@@ -153,7 +153,10 @@ abstract class ModuleGridCore extends Module
protected function csvExport($datas)
{
$this->_sort = $datas['defaultSortColumn'];
- $this->setLang(Context::getContext()->language->id);
+ $context = Context::getContext();
+ $this->setLang($context->language->id);
+ $this->setEmployee($context->employee->id);
+
if (isset($datas['option'])) {
$this->setOption($datas['option'], $layers);
}
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index e6bad5699..91e6473e5 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -1038,22 +1038,27 @@ class AdminCustomersControllerCore extends AdminController
$customer = new Customer();
if (Validate::isEmail($customer_email)) {
$customer->getByEmail($customer_email);
- }
- if ($customer->id) {
- $this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$customer_email;
+ if ($customer->id) {
+ $this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$customer_email;
+ $this->display = 'edit';
+ return $customer;
+ } elseif (trim(Tools::getValue('passwd')) == '') {
+ $this->validateRules();
+ $this->errors[] = Tools::displayError('Password can not be empty.');
+ $this->display = 'edit';
+ } elseif ($customer = parent::processAdd()) {
+ $this->context->smarty->assign('new_customer', $customer);
+ return $customer;
+ }
+ } else {
+ $this->errors[] = Tools::displayError('Invalid email address.');
$this->display = 'edit';
- return $customer;
- } elseif (trim(Tools::getValue('passwd')) == '') {
- $this->validateRules();
- $this->errors[] = Tools::displayError('Password can not be empty.');
- $this->display = 'edit';
- } elseif ($customer = parent::processAdd()) {
- $this->context->smarty->assign('new_customer', $customer);
- return $customer;
}
+
return false;
}
+
public function processUpdate()
{
if (Validate::isLoadedObject($this->object)) {
@@ -1064,7 +1069,10 @@ class AdminCustomersControllerCore extends AdminController
$customer = new Customer();
if (Validate::isEmail($customer_email)) {
$customer->getByEmail($customer_email);
+ } else {
+ $this->errors[] = Tools::displayError('Invalid email address.');
}
+
if (($customer->id) && ($customer->id != (int)$this->object->id)) {
$this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$customer_email;
}
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 6cb46c39b..0c6018ec8 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -2992,7 +2992,7 @@ class AdminNormalProductsControllerCore extends AdminController
->setUseSearch(false)
->setFullTree(0)
->setSelectedCategories($categories)
- ->setUseBulkActions(false);
+ ->setUseBulkActions(true);
$data->assign(array('default_category' => $default_category,
'selected_cat_ids' => implode(',', array_keys($selected_cat)),
@@ -3508,7 +3508,7 @@ class AdminNormalProductsControllerCore extends AdminController
->setRoomsOnly(false)
->setSelectedHotels($selectedElements['hotels'])
->setSelectedRoomTypes($selectedElements['room_types'])
- ->setUseBulkActions(false)
+ ->setUseBulkActions(true)
->setAccessedHotels(HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 0));
$data->assign('hotel_tree', $tree->render());
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index ce20646e3..b9338c916 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -5276,20 +5276,23 @@ class AdminOrdersControllerCore extends AdminController
// update order detail for selected aditional services
foreach ($selectedAdditonalServices['additional_services'] as $service) {
$serviceOrderDetail = new OrderDetail($service['id_order_detail']);
- if ($service['quantity'] >= $serviceOrderDetail->product_quantity) {
+
+ $cart_quantity = $service['quantity'];
+ if ($service['product_price_calculation_method'] == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
+ $cart_quantity = $cart_quantity * $product_quantity;
+ }
+ if ($cart_quantity >= $serviceOrderDetail->product_quantity) {
$serviceOrderDetail->delete();
} else {
- $order_detail->total_price_tax_incl -= Tools::ps_round($service['total_price_tax_incl'], 6);
- $order_detail->total_price_tax_excl -= Tools::ps_round($service['total_price_tax_excl'], 6);
-
- $serviceOldQuantity = $serviceOrderDetail->product_quantity;
- $serviceOrderDetail->product_quantity = $serviceOldQuantity - $service['quantity'];
+ $serviceOrderDetail->total_price_tax_incl -= Tools::ps_round($service['total_price_tax_incl'], 6);
+ $serviceOrderDetail->total_price_tax_excl -= Tools::ps_round($service['total_price_tax_excl'], 6);
+ $serviceOrderDetail->product_quantity -= $cart_quantity;
// update taxes
- $res &= $order_detail->updateTaxAmount($order);
+ $res &= $serviceOrderDetail->updateTaxAmount($order);
// Save order detail
- $res &= $order_detail->update();
+ $res &= $serviceOrderDetail->update();
}
}
/*End*/
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 32dccf8c1..6077661a9 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2202,10 +2202,14 @@ class AdminProductsControllerCore extends AdminController
}
if (!$res) {
- $this->errors[] = sprintf(
- Tools::displayError('The %s field is invalid.'),
- call_user_func(array($className, 'displayFieldName'), $field, $className)
- );
+ if (Tools::strtolower($field) == 'wholesale_price') {
+ $this->errors[] = Tools::displayError('The Pre-tax operating cost field is invalid.');
+ } else {
+ $this->errors[] = sprintf(
+ Tools::displayError('The %s field is invalid.'),
+ call_user_func(array($className, 'displayFieldName'), $field, $className)
+ );
+ }
}
}
}
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 8daa86948..42a3fb30c 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -77,7 +77,7 @@ class ContactControllerCore extends FrontController
SELECT cm.id_customer_thread FROM '._DB_PREFIX_.'customer_thread cm
WHERE cm.id_customer_thread = '.(int)$id_customer_thread.' AND cm.id_shop = '.(int)$this->context->shop->id.' AND token = \''.pSQL(Tools::getValue('token')).'\'')
) || (
- $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($from, $id_order)
+ $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($from, $id_order, $id_contact)
))) {
$fields = Db::getInstance()->executeS('
SELECT cm.id_customer_thread, cm.id_contact, cm.id_customer, cm.id_order, cm.id_product, cm.email
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 8c63c8907..a60326859 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -175,6 +175,7 @@ class OrderConfirmationControllerCore extends FrontController
$order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($idOrder, $customer->id_guest, $type_value['product_id']);
}
if ($rm_dtl = $obj_rm_type->getRoomTypeInfoByIdProduct($type_value['product_id'])) {
+ $cart_htl_data[$type_key]['id_order'] = $idOrder;
$cart_htl_data[$type_key]['id_product'] = $type_value['product_id'];
$cart_htl_data[$type_key]['cover_img'] = $cover_img;
$cart_htl_data[$type_key]['adults'] = $rm_dtl['adults'];
@@ -366,9 +367,6 @@ class OrderConfirmationControllerCore extends FrontController
}
}
- if (!empty($cart_htl_data)) {
- $this->context->smarty->assign('cart_htl_data', $cart_htl_data);
- }
if (!empty($cart_service_products)) {
$this->context->smarty->assign('cart_service_products', $cart_service_products);
}
@@ -399,6 +397,10 @@ class OrderConfirmationControllerCore extends FrontController
$this->context->smarty->assign('orders_has_invoice', $orders_has_invoice);
}
+ if (!empty($cart_htl_data)) {
+ $this->context->smarty->assign('cart_htl_data', $cart_htl_data);
+ }
+
$shw_bo_msg = Configuration::get('WK_SHOW_MSG_ON_BO');
$bo_msg = Configuration::get('WK_BO_MESSAGE');
$this->context->smarty->assign(
@@ -469,6 +471,8 @@ class OrderConfirmationControllerCore extends FrontController
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'history.css');
$this->addJS(_THEME_JS_DIR_.'history.js');
+ $this->addJS(_THEME_JS_DIR_.'order-confirmation.js');
+ $this->addCSS(_THEME_CSS_DIR_.'order-confirmation.css');
$this->addJqueryPlugin(array('fancybox')); //fancybox not found for some client theme
$this->addJqueryUI('ui.tooltip', 'base', true);
}
diff --git a/install/langs/cs/data/meta.xml b/install/langs/cs/data/meta.xml
index 8aea57f69..fee7a64b4 100644
--- a/install/langs/cs/data/meta.xml
+++ b/install/langs/cs/data/meta.xml
@@ -145,10 +145,10 @@
prodejny
-
Objednávka
+
Rychlá Objednávka
-
objednavka
+
rychla-objednavka
Sledování objednávky návštěvníka
diff --git a/js/admin/price.js b/js/admin/price.js
index 0097696d0..977499823 100644
--- a/js/admin/price.js
+++ b/js/admin/price.js
@@ -123,15 +123,12 @@ function calcPrice()
function calcPriceTI()
{
- var priceTE = parseFloat(document.getElementById('priceTEReal').value.replace(/,/g, '.'));
+ var priceTE = parseFloat($('#priceTEReal').val().replace(/,/g, '.'));
var newPrice = addTaxes(priceTE);
- document.getElementById('priceTI').value = (isNaN(newPrice) == true || newPrice < 0) ? '' :
- ps_round(newPrice, priceDisplayPrecision);
- document.getElementById('finalPrice').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' :
- ps_round(newPrice, priceDisplayPrecision).toFixed(priceDisplayPrecision);
- document.getElementById('finalPriceWithoutTax').innerHTML = (isNaN(priceTE) == true || priceTE < 0) ? '' :
- (ps_round(priceTE, 6)).toFixed(6);
+ $('#priceTI').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, priceDisplayPrecision));
+ $('#finalPrice').html((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, priceDisplayPrecision).toFixed(priceDisplayPrecision));
+ $('#finalPriceWithoutTax').html((isNaN(priceTE) == true || priceTE < 0) ? '' : (ps_round(priceTE, 6)).toFixed(6));
calcReduction();
if (isNaN(parseFloat($('#priceTI').val())))
@@ -149,15 +146,13 @@ function calcPriceTI()
function calcPriceTE()
{
ecotax_tax_excl = $('#ecotax').val() / (1 + ecotaxTaxRate);
- var priceTI = parseFloat(document.getElementById('priceTI').value.replace(/,/g, '.'));
+ var priceTI = parseFloat($('#priceTI').val().replace(/,/g, '.'));
var newPrice = removeTaxes(ps_round(priceTI - getEcotaxTaxIncluded(), priceDisplayPrecision));
- document.getElementById('priceTE').value = (isNaN(newPrice) == true || newPrice < 0) ? '' :
- ps_round(newPrice, 6).toFixed(6);
- document.getElementById('priceTEReal').value = (isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9);
- document.getElementById('finalPrice').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' :
- ps_round(priceTI, priceDisplayPrecision).toFixed(priceDisplayPrecision);
- document.getElementById('finalPriceWithoutTax').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' :
- (ps_round(newPrice, 6)).toFixed(6);
+
+ $('#priceTE').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, 6).toFixed(6));
+ $('#priceTEReal').val((isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9));
+ $('#finalPrice').html((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(priceTI, priceDisplayPrecision).toFixed(priceDisplayPrecision));
+ $('#finalPriceWithoutTax').html((isNaN(newPrice) == true || newPrice < 0) ? '' : (ps_round(newPrice, 6)).toFixed(6));
calcReduction();
}
diff --git a/js/daterangepicker/jquery.daterangepicker.js b/js/daterangepicker/jquery.daterangepicker.js
index e9338be38..6115348dc 100755
--- a/js/daterangepicker/jquery.daterangepicker.js
+++ b/js/daterangepicker/jquery.daterangepicker.js
@@ -2597,7 +2597,7 @@
if (opt.endDate && compare_month(nextMonth(defaultTime), opt.endDate) > 0) defaultTime = prevMonth(moment(opt.endDate).toDate());
}
- if (opt.singleDate) {
+ if (opt.singleDate || opt.singleMonth) {
if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = moment(opt.startDate).toDate();
if (opt.endDate && compare_month(defaultTime, opt.endDate) > 0) defaultTime = moment(opt.endDate).toDate();
}
diff --git a/js/daterangepicker/jquery.daterangepicker.min.js b/js/daterangepicker/jquery.daterangepicker.min.js
index 508ddcce6..4c7a27afd 100755
--- a/js/daterangepicker/jquery.daterangepicker.min.js
+++ b/js/daterangepicker/jquery.daterangepicker.min.js
@@ -4,4 +4,4 @@
* @link https://github.com/longbill/jquery-date-range-picker
* @license MIT
*/
-!function(e){"function"==typeof define&&define.amd?define(["jquery","moment"],e):"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery"),require("moment")):e(jQuery,moment)}(function(U,Q){"use strict";U.dateRangePickerLanguages={default:{selected:"Selected:",day:"Day",days:"Days",apply:"Close","week-1":"mo","week-2":"tu","week-3":"we","week-4":"th","week-5":"fr","week-6":"sa","week-7":"su","week-number":"W","month-name":["january","february","march","april","may","june","july","august","september","october","november","december"],shortcuts:"Shortcuts","custom-values":"Custom Values",past:"Past",following:"Following",previous:"Previous","prev-week":"Week","prev-month":"Month","prev-year":"Year",next:"Next","next-week":"Week","next-month":"Month","next-year":"Year","less-than":"Date range should not be more than %d days","more-than":"Date range should not be less than %d days","default-more":"Please select a date range longer than %d days","default-single":"Please select a date","default-less":"Please select a date range less than %d days","default-range":"Please select a date range between %d and %d days","default-default":"Please select a date range",time:"Time",hour:"Hour",minute:"Minute"},id:{selected:"Terpilih:",day:"Hari",days:"Hari",apply:"Tutup","week-1":"sen","week-2":"sel","week-3":"rab","week-4":"kam","week-5":"jum","week-6":"sab","week-7":"min","week-number":"W","month-name":["januari","februari","maret","april","mei","juni","juli","agustus","september","oktober","november","desember"],shortcuts:"Pintas","custom-values":"Nilai yang ditentukan",past:"Yang Lalu",following:"Mengikuti",previous:"Sebelumnya","prev-week":"Minggu","prev-month":"Bulan","prev-year":"Tahun",next:"Selanjutnya","next-week":"Minggu","next-month":"Bulan","next-year":"Tahun","less-than":"Tanggal harus lebih dari %d hari","more-than":"Tanggal harus kurang dari %d hari","default-more":"Jarak tanggal harus lebih lama dari %d hari","default-single":"Silakan pilih tanggal","default-less":"Jarak rentang tanggal tidak boleh lebih lama dari %d hari","default-range":"Rentang tanggal harus antara %d dan %d hari","default-default":"Silakan pilih rentang tanggal",time:"Waktu",hour:"Jam",minute:"Menit"},az:{selected:"Seçildi:",day:" gün",days:" gün",apply:"tətbiq","week-1":"1","week-2":"2","week-3":"3","week-4":"4","week-5":"5","week-6":"6","week-7":"7","month-name":["yanvar","fevral","mart","aprel","may","iyun","iyul","avqust","sentyabr","oktyabr","noyabr","dekabr"],shortcuts:"Qısayollar",past:"Keçmiş",following:"Növbəti",previous:" ","prev-week":"Öncəki həftə","prev-month":"Öncəki ay","prev-year":"Öncəki il",next:" ","next-week":"Növbəti həftə","next-month":"Növbəti ay","next-year":"Növbəti il","less-than":"Tarix aralığı %d gündən çox olmamalıdır","more-than":"Tarix aralığı %d gündən az olmamalıdır","default-more":"%d gündən çox bir tarix seçin","default-single":"Tarix seçin","default-less":"%d gündən az bir tarix seçin","default-range":"%d və %d gün aralığında tarixlər seçin","default-default":"Tarix aralığı seçin"},bg:{selected:"Избрано:",day:"Ден",days:"Дни",apply:"Затвори","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","week-number":"С","month-name":["януари","февруари","март","април","май","юни","юли","август","септември","октомври","ноември","декември"],shortcuts:"Преки пътища","custom-values":"Персонализирани стойности",past:"Минал",following:"Следващ",previous:"Предишен","prev-week":"Седмица","prev-month":"Месец","prev-year":"Година",next:"Следващ","next-week":"Седмица","next-month":"Месец","next-year":"Година","less-than":"Периодът от време не трябва да е повече от %d дни","more-than":"Периодът от време не трябва да е по-малко от %d дни","default-more":"Моля изберете период по-дълъг от %d дни","default-single":"Моля изберете дата","default-less":"Моля изберете период по-къс от %d дни","default-range":"Моля изберете период между %d и %d дни","default-default":"Моля изберете период",time:"Време",hour:"Час",minute:"Минута"},cn:{selected:"已选择:",day:"天",days:"天",apply:"确定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"周","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快捷选择",past:"过去",following:"将来",previous:" ","prev-week":"上周","prev-month":"上个月","prev-year":"去年",next:" ","next-week":"下周","next-month":"下个月","next-year":"明年","less-than":"所选日期范围不能大于%d天","more-than":"所选日期范围不能小于%d天","default-more":"请选择大于%d天的日期范围","default-less":"请选择小于%d天的日期范围","default-range":"请选择%d天到%d天的日期范围","default-single":"请选择一个日期","default-default":"请选择一个日期范围",time:"时间",hour:"小时",minute:"分钟"},cz:{selected:"Vybráno:",day:"Den",days:"Dny",apply:"Zavřít","week-1":"po","week-2":"út","week-3":"st","week-4":"čt","week-5":"pá","week-6":"so","week-7":"ne","month-name":["leden","únor","březen","duben","květen","červen","červenec","srpen","září","říjen","listopad","prosinec"],shortcuts:"Zkratky",past:"po",following:"následující",previous:"předchozí","prev-week":"týden","prev-month":"měsíc","prev-year":"rok",next:"další","next-week":"týden","next-month":"měsíc","next-year":"rok","less-than":"Rozsah data by neměl být větší než %d dnů","more-than":"Rozsah data by neměl být menší než %d dnů","default-more":"Prosím zvolte rozsah data větší než %d dnů","default-single":"Prosím zvolte datum","default-less":"Prosím zvolte rozsah data menší než %d dnů","default-range":"Prosím zvolte rozsah data mezi %d a %d dny","default-default":"Prosím zvolte rozsah data"},de:{selected:"Auswahl:",day:"Tag",days:"Tage",apply:"Schließen","week-1":"mo","week-2":"di","week-3":"mi","week-4":"do","week-5":"fr","week-6":"sa","week-7":"so","month-name":["januar","februar","märz","april","mai","juni","juli","august","september","oktober","november","dezember"],shortcuts:"Schnellwahl",past:"Vorherige",following:"Folgende",previous:"Vorherige","prev-week":"Woche","prev-month":"Monat","prev-year":"Jahr",next:"Nächste","next-week":"Woche","next-month":"Monat","next-year":"Jahr","less-than":"Datumsbereich darf nicht größer sein als %d Tage","more-than":"Datumsbereich darf nicht kleiner sein als %d Tage","default-more":"Bitte mindestens %d Tage auswählen","default-single":"Bitte ein Datum auswählen","default-less":"Bitte weniger als %d Tage auswählen","default-range":"Bitte einen Datumsbereich zwischen %d und %d Tagen auswählen","default-default":"Bitte ein Start- und Enddatum auswählen",Time:"Zeit",hour:"Stunde",minute:"Minute"},es:{selected:"Seleccionado:",day:"Día",days:"Días",apply:"Cerrar","week-1":"lu","week-2":"ma","week-3":"mi","week-4":"ju","week-5":"vi","week-6":"sa","week-7":"do","month-name":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],shortcuts:"Accesos directos",past:"Pasado",following:"Siguiente",previous:"Anterior","prev-week":"Semana","prev-month":"Mes","prev-year":"Año",next:"Siguiente","next-week":"Semana","next-month":"Mes","next-year":"Año","less-than":"El rango no debería ser mayor de %d días","more-than":"El rango no debería ser menor de %d días","default-more":"Por favor selecciona un rango mayor a %d días","default-single":"Por favor selecciona un día","default-less":"Por favor selecciona un rango menor a %d días","default-range":"Por favor selecciona un rango entre %d y %d días","default-default":"Por favor selecciona un rango de fechas."},fr:{selected:"Sélection:",day:"Jour",days:"Jours",apply:"Fermer","week-1":"lu","week-2":"ma","week-3":"me","week-4":"je","week-5":"ve","week-6":"sa","week-7":"di","month-name":["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],shortcuts:"Raccourcis",past:"Passé",following:"Suivant",previous:"Précédent","prev-week":"Semaine","prev-month":"Mois","prev-year":"Année",next:"Suivant","next-week":"Semaine","next-month":"Mois","next-year":"Année","less-than":"L'intervalle ne doit pas être supérieure à %d jours","more-than":"L'intervalle ne doit pas être inférieure à %d jours","default-more":"Merci de choisir une intervalle supérieure à %d jours","default-single":"Merci de choisir une date","default-less":"Merci de choisir une intervalle inférieure %d jours","default-range":"Merci de choisir une intervalle comprise entre %d et %d jours","default-default":"Merci de choisir une date"},hu:{selected:"Kiválasztva:",day:"Nap",days:"Nap",apply:"Ok","week-1":"h","week-2":"k","week-3":"sz","week-4":"cs","week-5":"p","week-6":"sz","week-7":"v","month-name":["január","február","március","április","május","június","július","augusztus","szeptember","október","november","december"],shortcuts:"Gyorsválasztó",past:"Múlt",following:"Következő",previous:"Előző","prev-week":"Hét","prev-month":"Hónap","prev-year":"Év",next:"Következő","next-week":"Hét","next-month":"Hónap","next-year":"Év","less-than":"A kiválasztás nem lehet több %d napnál","more-than":"A kiválasztás nem lehet több %d napnál","default-more":"Válassz ki egy időszakot ami hosszabb mint %d nap","default-single":"Válassz egy napot","default-less":"Válassz ki egy időszakot ami rövidebb mint %d nap","default-range":"Válassz ki egy %d - %d nap hosszú időszakot","default-default":"Válassz ki egy időszakot"},it:{selected:"Selezionati:",day:"Giorno",days:"Giorni",apply:"Chiudi","week-1":"lu","week-2":"ma","week-3":"me","week-4":"gi","week-5":"ve","week-6":"sa","week-7":"do","month-name":["gennaio","febbraio","marzo","aprile","maggio","giugno","luglio","agosto","settembre","ottobre","novembre","dicembre"],shortcuts:"Scorciatoie",past:"Scorso",following:"Successivo",previous:"Precedente","prev-week":"Settimana","prev-month":"Mese","prev-year":"Anno",next:"Prossimo","next-week":"Settimana","next-month":"Mese","next-year":"Anno","less-than":"L'intervallo non dev'essere maggiore di %d giorni","more-than":"L'intervallo non dev'essere minore di %d giorni","default-more":"Seleziona un intervallo maggiore di %d giorni","default-single":"Seleziona una data","default-less":"Seleziona un intervallo minore di %d giorni","default-range":"Seleziona un intervallo compreso tra i %d e i %d giorni","default-default":"Seleziona un intervallo di date"},ko:{selected:"기간:",day:"일",days:"일간",apply:"닫기","week-1":"월","week-2":"화","week-3":"수","week-4":"목","week-5":"금","week-6":"토","week-7":"일","week-number":"주","month-name":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],shortcuts:"단축키들",past:"지난(오늘기준)",following:"이후(오늘기준)",previous:"이전","prev-week":"1주","prev-month":"1달","prev-year":"1년",next:"다음","next-week":"1주","next-month":"1달","next-year":"1년","less-than":"날짜 범위는 %d 일보다 많을 수 없습니다","more-than":"날짜 범위는 %d 일보다 작을 수 없습니다","default-more":"날짜 범위를 %d 일보다 길게 선택해 주세요","default-single":"날짜를 선택해 주세요","default-less":"%d 일보다 작은 날짜를 선택해 주세요","default-range":"%d와 %d 일 사이의 날짜 범위를 선택해 주세요","default-default":"날짜 범위를 선택해 주세요",time:"시각",hour:"시",minute:"분"},no:{selected:"Valgt:",day:"Dag",days:"Dager",apply:"Lukk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],shortcuts:"Snarveier","custom-values":"Egendefinerte Verdier",past:"Over",following:"Følger",previous:"Forrige","prev-week":"Uke","prev-month":"Måned","prev-year":"År",next:"Neste","next-week":"Uke","next-month":"Måned","next-year":"År","less-than":"Datoperioden skal ikkje være lengre enn %d dager","more-than":"Datoperioden skal ikkje være kortere enn %d dager","default-more":"Vennligst velg ein datoperiode lengre enn %d dager","default-single":"Vennligst velg ein dato","default-less":"Vennligst velg ein datoperiode mindre enn %d dager","default-range":"Vennligst velg ein datoperiode mellom %d og %d dager","default-default":"Vennligst velg ein datoperiode",time:"Tid",hour:"Time",minute:"Minutter"},nl:{selected:"Geselecteerd:",day:"Dag",days:"Dagen",apply:"Ok","week-1":"ma","week-2":"di","week-3":"wo","week-4":"do","week-5":"vr","week-6":"za","week-7":"zo","month-name":["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],shortcuts:"Snelkoppelingen","custom-values":"Aangepaste waarden",past:"Verleden",following:"Komend",previous:"Vorige","prev-week":"Week","prev-month":"Maand","prev-year":"Jaar",next:"Volgende","next-week":"Week","next-month":"Maand","next-year":"Jaar","less-than":"Interval moet langer dan %d dagen zijn","more-than":"Interval mag niet minder dan %d dagen zijn","default-more":"Selecteer een interval langer dan %dagen","default-single":"Selecteer een datum","default-less":"Selecteer een interval minder dan %d dagen","default-range":"Selecteer een interval tussen %d en %d dagen","default-default":"Selecteer een interval",time:"Tijd",hour:"Uur",minute:"Minuut"},ru:{selected:"Выбрано:",day:"День",days:"Дней",apply:"Применить","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"вс","month-name":["январь","февраль","март","апрель","май","июнь","июль","август","сентябрь","октябрь","ноябрь","декабрь"],shortcuts:"Быстрый выбор","custom-values":"Пользовательские значения",past:"Прошедшие",following:"Следующие",previous:" ","prev-week":"Неделя","prev-month":"Месяц","prev-year":"Год",next:" ","next-week":"Неделя","next-month":"Месяц","next-year":"Год","less-than":"Диапазон не может быть больше %d дней","more-than":"Диапазон не может быть меньше %d дней","default-more":"Пожалуйста выберите диапазон больше %d дней","default-single":"Пожалуйста выберите дату","default-less":"Пожалуйста выберите диапазон меньше %d дней","default-range":"Пожалуйста выберите диапазон между %d и %d днями","default-default":"Пожалуйста выберите диапазон",time:"Время",hour:"Часы",minute:"Минуты"},uk:{selected:"Вибрано:",day:"День",days:"Днів",apply:"Застосувати","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","month-name":["січень","лютий","березень","квітень","травень","червень","липень","серпень","вересень","жовтень","листопад","грудень"],shortcuts:"Швидкий вибір","custom-values":"Значення користувача",past:"Минулі",following:"Наступні",previous:" ","prev-week":"Тиждень","prev-month":"Місяць","prev-year":"Рік",next:" ","next-week":"Тиждень","next-month":"Місяць","next-year":"Рік","less-than":"Діапазон не може бути більш ніж %d днів","more-than":"Діапазон не може бути меньш ніж %d днів","default-more":"Будь ласка виберіть діапазон більше %d днів","default-single":"Будь ласка виберіть дату","default-less":"Будь ласка виберіть діапазон менше %d днів","default-range":"Будь ласка виберіть діапазон між %d та %d днями","default-default":"Будь ласка виберіть діапазон",time:"Час",hour:"Години",minute:"Хвилини"},pl:{selected:"Wybrany:",day:"Dzień",days:"Dni",apply:"Zamknij","week-1":"pon","week-2":"wt","week-3":"śr","week-4":"czw","week-5":"pt","week-6":"so","week-7":"nd","month-name":["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],shortcuts:"Skróty","custom-values":"Niestandardowe wartości",past:"Przeszłe",following:"Następne",previous:"Poprzednie","prev-week":"tydzień","prev-month":"miesiąc","prev-year":"rok",next:"Następny","next-week":"tydzień","next-month":"miesiąc","next-year":"rok","less-than":"Okres nie powinien być dłuższy niż %d dni","more-than":"Okres nie powinien być krótszy niż %d ni","default-more":"Wybierz okres dłuższy niż %d dni","default-single":"Wybierz datę","default-less":"Wybierz okres krótszy niż %d dni","default-range":"Wybierz okres trwający od %d do %d dni","default-default":"Wybierz okres",time:"Czas",hour:"Godzina",minute:"Minuta"},se:{selected:"Vald:",day:"dag",days:"dagar",apply:"godkänn","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lö","week-7":"sö","month-name":["januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december"],shortcuts:"genvägar","custom-values":"Anpassade värden",past:"över",following:"följande",previous:"förra","prev-week":"vecka","prev-month":"månad","prev-year":"år",next:"nästa","next-week":"vecka","next-month":"måned","next-year":"år","less-than":"Datumintervall bör inte vara mindre än %d dagar","more-than":"Datumintervall bör inte vara mer än %d dagar","default-more":"Välj ett datumintervall längre än %d dagar","default-single":"Välj ett datum","default-less":"Välj ett datumintervall mindre än %d dagar","default-range":"Välj ett datumintervall mellan %d och %d dagar","default-default":"Välj ett datumintervall",time:"tid",hour:"timme",minute:"minut"},pt:{selected:"Selecionado:",day:"Dia",days:"Dias",apply:"Fechar","week-1":"seg","week-2":"ter","week-3":"qua","week-4":"qui","week-5":"sex","week-6":"sab","week-7":"dom","week-number":"N","month-name":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],shortcuts:"Atalhos","custom-values":"Valores Personalizados",past:"Passado",following:"Seguinte",previous:"Anterior","prev-week":"Semana","prev-month":"Mês","prev-year":"Ano",next:"Próximo","next-week":"Próxima Semana","next-month":"Próximo Mês","next-year":"Próximo Ano","less-than":"O período selecionado não deve ser maior que %d dias","more-than":"O período selecionado não deve ser menor que %d dias","default-more":"Selecione um período superior a %d dias","default-single":"Selecione uma data","default-less":"Selecione um período inferior a %d dias","default-range":"Selecione um período de %d a %d dias","default-default":"Selecione um período",time:"Tempo",hour:"Hora",minute:"Minuto"},tc:{selected:"已選擇:",day:"天",days:"天",apply:"確定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"週","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快速選擇",past:"過去",following:"將來",previous:" ","prev-week":"上週","prev-month":"上個月","prev-year":"去年",next:" ","next-week":"下週","next-month":"下個月","next-year":"明年","less-than":"所選日期範圍不能大於%d天","more-than":"所選日期範圍不能小於%d天","default-more":"請選擇大於%d天的日期範圍","default-less":"請選擇少於%d天的日期範圍","default-range":"請選擇%d天到%d天的日期範圍","default-single":"請選擇一個日期","default-default":"請選擇一個日期範圍",time:"日期",hour:"小時",minute:"分鐘"},ja:{selected:"選択しました:",day:"日",days:"日",apply:"確定","week-1":"月","week-2":"火","week-3":"水","week-4":"木","week-5":"金","week-6":"土","week-7":"日","month-name":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],shortcuts:"クイック選択",past:"過去",following:"将来",previous:" ","prev-week":"先週","prev-month":"先月","prev-year":"昨年",next:" ","next-week":"来週","next-month":"来月","next-year":"来年","less-than":"日付の範囲は％d日以上にすべきではありません","more-than":"日付の範囲は％d日を下回ってはいけません","default-more":"％d日よりも長い期間を選択してください","default-less":"％d日未満の期間を選択してください","default-range":"％d日と％d日の間の日付範囲を選択してください","default-single":"日付を選択してください","default-default":"日付範囲を選択してください",time:"時間",hour:"時間",minute:"分"},da:{selected:"Valgt:",day:"Dag",days:"Dage",apply:"Luk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december"],shortcuts:"genveje","custom-values":"Brugerdefinerede værdier",past:"Forbi",following:"Følgende",previous:"Forrige","prev-week":"uge","prev-month":"måned","prev-year":"år",next:"Næste","next-week":"uge","next-month":"måned","next-year":"år","less-than":"Dato interval bør ikke være med end %d dage","more-than":"Dato interval bør ikke være mindre end %d dage","default-more":"Vælg datointerval længere end %d dage","default-single":"Vælg dato","default-less":"Vælg datointerval mindre end %d dage","default-range":"Vælg datointerval mellem %d og %d dage","default-default":"Vælg datointerval",time:"tid",hour:"time",minute:"minut"},fi:{selected:"Valittu:",day:"Päivä",days:"Päivää",apply:"Sulje","week-1":"ma","week-2":"ti","week-3":"ke","week-4":"to","week-5":"pe","week-6":"la","week-7":"su","week-number":"V","month-name":["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],shortcuts:"Pikavalinnat","custom-values":"Mukautetut Arvot",past:"Menneet",following:"Tulevat",previous:"Edellinen","prev-week":"Viikko","prev-month":"Kuukausi","prev-year":"Vuosi",next:"Seuraava","next-week":"Viikko","next-month":"Kuukausi","next-year":"Vuosi","less-than":"Aikajakson tulisi olla vähemmän kuin %d päivää","more-than":"Aikajakson ei tulisi olla vähempää kuin %d päivää","default-more":"Valitse pidempi aikajakso kuin %d päivää","default-single":"Valitse päivä","default-less":"Valitse lyhyempi aikajakso kuin %d päivää","default-range":"Valitse aikajakso %d ja %d päivän väliltä","default-default":"Valitse aikajakso",time:"Aika",hour:"Tunti",minute:"Minuutti"},cat:{selected:"Seleccionats:",day:"Dia",days:"Dies",apply:"Tanca","week-1":"Dl","week-2":"Dm","week-3":"Dc","week-4":"Dj","week-5":"Dv","week-6":"Ds","week-7":"Dg","week-number":"S","month-name":["gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre"],shortcuts:"Dreçeres","custom-values":"Valors personalitzats",past:"Passat",following:"Futur",previous:"Anterior","prev-week":"Setmana","prev-month":"Mes","prev-year":"Any",next:"Següent","next-week":"Setmana","next-month":"Mes","next-year":"Any","less-than":"El període no hauria de ser de més de %d dies","more-than":"El període no hauria de ser de menys de %d dies","default-more":"Perfavor selecciona un període més gran de %d dies","default-single":"Perfavor selecciona una data","default-less":"Perfavor selecciona un període de menys de %d dies","default-range":"Perfavor selecciona un període d'entre %d i %d dies","default-default":"Perfavor selecciona un període",time:"Temps",hour:"Hora",minute:"Minut"},sk:{selected:"Vybrané:",day:"Deň",days:"Dni",apply:"Zavrieť","week-1":"po","week-2":"út","week-3":"st","week-4":"št","week-5":"pi","week-6":"so","week-7":"ne","week-number":"T","month-name":["január","február","marec","apríl","máj","jún","júl","august","september","október","november","december"],shortcuts:"Skratky","custom-values":"Vlastné hodnoty",past:"po",following:"nasledujúci",previous:"predchádzajúci","prev-week":"týždeň","prev-month":"mesiac","prev-year":"rok",next:"ďalší","next-week":"týždeň","next-month":"mesiac","next-year":"rok","less-than":"Rozsah dátumu by nemal byť väčší ako %d dní","more-than":"Rozsah dátumu by nemal byť menší ako %d dní","default-more":"Prosím zvoľte rozsah dlhší ako %d dní","default-single":"Prosím zvoľte dátum","default-less":"Prosím zvoľte rozsah menší ako %d dní","default-range":"Prosím zvoľte rozsah medzi %d a %d dňami","default-default":"Prosím zvoľte rozsah",time:"Čas",hour:"Hodina",minute:"Minúta"}},U.fn.dateRangePicker=function(f){f||(f={}),(f=U.extend(!0,{autoClose:!1,format:"YYYY-MM-DD",separator:" to ",language:"auto",startOfWeek:"sunday",getValue:function(){return U(this).val()},setValue:function(e){U(this).attr("readonly")||U(this).is(":disabled")||e==U(this).val()||U(this).val(e)},startDate:!1,endDate:!1,time:{enabled:!1},minDays:0,maxDays:0,showShortcuts:!1,shortcuts:{},customShortcuts:[],inline:!1,container:"body",alwaysOpen:!1,singleDate:!1,lookBehind:!1,batchMode:!1,duration:200,stickyMonths:!1,dayDivAttrs:[],dayTdAttrs:[],selectForward:!1,selectBackward:!1,applyBtnClass:"",singleMonth:"auto",hoveringTooltip:function(e,t,a){return 1
'+f.customTopBar+"