Merge branch 'webkul:develop' into gli-1435

This commit is contained in:
abhishek-webkul
2023-09-14 11:45:10 +05:30
committed by GitHub
77 changed files with 1088 additions and 1100 deletions

View File

@@ -54,7 +54,7 @@ class AdminCartsControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'connections` co ON (a.id_guest = co.id_guest AND TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', co.`date_add`)) < 1800)';
$this->_group = ' GROUP BY a.`id_cart`';
if (Tools::getValue('action') == 'filterAbandonedCarts') {
if (Tools::getValue('action') == 'filterOnlyAbandonedCarts') {
$this->_filterHaving = ' AND `ids_order` = 0 AND `time_diff` > 86400';
}

View File

@@ -54,20 +54,20 @@ class AdminCountriesControllerCore extends AdminController
'dir' => 'st'
);
$this->fields_options = array(
'general' => array(
'title' => $this->l('Country options'),
'fields' => array(
'PS_RESTRICT_DELIVERED_COUNTRIES' => array(
'title' => $this->l('Restrict country selections in front office to those covered by active carriers'),
'cast' => 'intval',
'type' => 'bool',
'default' => '0'
)
),
'submit' => array('title' => $this->l('Save'))
)
);
// $this->fields_options = array(
// 'general' => array(
// 'title' => $this->l('Country options'),
// 'fields' => array(
// 'PS_RESTRICT_DELIVERED_COUNTRIES' => array(
// 'title' => $this->l('Restrict country selections in front office to those covered by active carriers'),
// 'cast' => 'intval',
// 'type' => 'bool',
// 'default' => '0'
// )
// ),
// 'submit' => array('title' => $this->l('Save'))
// )
// );
$zones_array = array();
$this->zones = Zone::getZones();

View File

@@ -97,6 +97,8 @@ class AdminLogsControllerCore extends AdminController
$this->list_no_link = true;
$this->_select .= 'CONCAT(e.firstname, \' \', e.lastname) employee';
$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'employee e ON (a.id_employee = e.id_employee)';
$this->_orderBy = 'a.date_add';
$this->_orderWay = 'DESC';
$this->_use_found_rows = false;
parent::__construct();
}

View File

@@ -2354,7 +2354,7 @@ class AdminProductsControllerCore extends AdminController
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_room_types';
$helper->refresh = (bool)(ConfigurationKPI::get('DISABLED_ROOM_TYPES_EXPIRE') < $time);
$helper->tooltip = $this->l('X% of your room types are disabled and not visible to your customers', null, null, false);
$helper->href = Context::getContext()->link->getAdminLink('AdminProducts').'&productFilter_active=0&submitFilterproduct=1';
$helper->href = Context::getContext()->link->getAdminLink('AdminProducts').'&productFilter_sa!active=0&submitFilterproduct=1';
$kpis[] = $helper->generate();
$helper = new HelperKpiRow();