From 75a721c6f5e0b9706e128d6a2bbba64116901bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=E1=BB=93=20Ng=E1=BB=8Dc=20Tri=E1=BB=83n?= Date: Thu, 29 Dec 2016 20:46:31 +0700 Subject: [PATCH] Add sort default type --- modules/shops/action_mysql.php | 1 + modules/shops/admin/setting.php | 46 +++++++++++++------ .../blocks/global.block_bxproduct_center.php | 26 +++++++---- .../blocks/global.block_product_center.php | 10 +++- .../blocks/module.block_product_center.php | 10 +++- modules/shops/funcs/group.php | 2 +- modules/shops/funcs/main.php | 2 +- modules/shops/funcs/search.php | 10 +++- modules/shops/funcs/viewcat.php | 2 +- modules/shops/language/admin_vi.php | 4 ++ .../admin_default/modules/shops/setting.tpl | 10 ++++ 11 files changed, 93 insertions(+), 30 deletions(-) diff --git a/modules/shops/action_mysql.php b/modules/shops/action_mysql.php index 5b06a0afc..ad82cfc10 100644 --- a/modules/shops/action_mysql.php +++ b/modules/shops/action_mysql.php @@ -757,6 +757,7 @@ class varchar(25) NOT NULL DEFAULT '', $data['template_active'] = '0'; $data['download_active'] = '0'; $data['download_groups'] = '6'; +$data['sortdefault'] = 0; foreach ($data as $config_name => $config_value) { $sql_create_module[] = "INSERT INTO " . NV_CONFIG_GLOBALTABLE . " (lang, module, config_name, config_value) VALUES ('" . $lang . "', " . $db->quote($module_name) . ", " . $db->quote($config_name) . ", " . $db->quote($config_value) . ")"; diff --git a/modules/shops/admin/setting.php b/modules/shops/admin/setting.php index 1ade02d8c..b1160c059 100644 --- a/modules/shops/admin/setting.php +++ b/modules/shops/admin/setting.php @@ -7,7 +7,6 @@ * @License GNU/GPL version 2 or any later version * @Createdate 2-9-2010 14:43 */ - if (! defined('NV_IS_FILE_ADMIN')) { die('Stop!!!'); } @@ -71,6 +70,7 @@ $data['groups_notify'] = ! empty($_groups_notify) ? implode(',', array_intersect($_groups_notify, array_keys($groups_list))) : ''; $data['active_tooltip'] = $nv_Request->get_int('active_tooltip', 'post', 0); $data['show_product_code'] = $nv_Request->get_int('show_product_code', 'post', 0); + $data['sortdefault'] = $nv_Request->get_int('sortdefault', 'post', 0); $data['show_compare'] = $nv_Request->get_int('show_compare', 'post', 0); $data['show_displays'] = $nv_Request->get_int('show_displays', 'post', 0); $data['use_shipping'] = $nv_Request->get_int('use_shipping', 'post', 0); @@ -93,7 +93,7 @@ $data['download_active'] = $nv_Request->get_int('download_active', 'post', 0); $_dowload_groups = $nv_Request->get_array('download_groups', 'post', array()); $data['download_groups'] = ! empty($_dowload_groups) ? implode(',', nv_groups_post(array_intersect($_dowload_groups, array_keys($groups_list_default)))) : ''; - + if ($error == '') { $sth = $db->prepare("UPDATE " . NV_CONFIG_GLOBALTABLE . " SET config_value = :config_value WHERE lang = '" . NV_LANG_DATA . "' AND module = :module_name AND config_name = :config_name"); $sth->bindParam(':module_name', $module_name, PDO::PARAM_STR); @@ -102,16 +102,16 @@ $sth->bindParam(':config_value', $config_value, PDO::PARAM_STR); $sth->execute(); } - + $mid = intval($currencies_array[$data['money_unit']]['numeric']); - + $sql = "UPDATE " . $db_config['prefix'] . "_" . $module_data . "_money_" . NV_LANG_DATA . " SET exchange = '1' WHERE id = " . $mid; $db->query($sql); - + nv_insert_logs(NV_LANG_DATA, $module_name, $lang_module['setting'], "Setting", $admin_info['userid']); $nv_Cache->delMod('settings'); $nv_Cache->delMod($module_name); - + Header("Location: " . NV_BASE_ADMINURL . "index.php?" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . '=setting'); die(); } @@ -123,7 +123,7 @@ $sql = "SELECT * FROM " . $db_config['prefix'] . "_" . $module_data . "_payment ORDER BY weight ASC"; $result = $db->query($sql); $num_items = $result->rowCount(); - + while ($row = $result->fetch()) { $array_setting_payment[$row['payment']] = $row; } @@ -135,9 +135,12 @@ $xtpl->assign('MODULE_NAME', $module_name); // Số sản phẩm hiển thị trên một dòng -for ($i = 1; $i <= 10; $i++) { +for ($i = 1; $i <= 10; $i ++) { if (24 % $i == 0) { - $xtpl->assign('PER_ROW', array( 'value' => $i, 'selected' => $data['per_row'] == $i ? 'selected="selected"' : '' )); + $xtpl->assign('PER_ROW', array( + 'value' => $i, + 'selected' => $data['per_row'] == $i ? 'selected="selected"' : '' + )); $xtpl->parse('main.per_row'); } } @@ -256,7 +259,7 @@ // Tien te $result = $db->query("SELECT code, currency FROM " . $db_config['prefix'] . "_" . $module_data . "_money_" . NV_LANG_DATA . " ORDER BY code DESC"); -while (list($code, $currency) = $result->fetch(3)) { +while (list ($code, $currency) = $result->fetch(3)) { $array_temp = array(); $array_temp['value'] = $code; $array_temp['title'] = $code . " - " . $currency; @@ -267,7 +270,7 @@ // Don vi khoi luong $result = $db->query("SELECT code, title FROM " . $db_config['prefix'] . "_" . $module_data . "_weight_" . NV_LANG_DATA . " ORDER BY code DESC"); -while (list($code, $title) = $result->fetch(3)) { +while (list ($code, $title) = $result->fetch(3)) { $array_temp = array(); $array_temp['value'] = $code; $array_temp['title'] = $code . " - " . $title; @@ -285,7 +288,7 @@ )); $xtpl->parse('main.download_groups'); } -if (!$data['download_active']) { +if (! $data['download_active']) { $xtpl->parse('main.download_groups_none'); } @@ -300,7 +303,7 @@ $a = 0; $all_page = sizeof($array_setting_payment); $payment = $nv_Request->get_string('payment', 'get', 0); - + foreach ($array_setting_payment as $value) { $value['titleactive'] = (! empty($value['active'])) ? $lang_global['yes'] : $lang_global['no']; $value['link_edit'] = NV_BASE_ADMINURL . "index.php?" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=payport&payment=" . $value['payment']; @@ -311,7 +314,7 @@ $value['slect_weight'] = drawselect_number($value['payment'], 1, $all_page + 1, $value['weight'], "nv_chang_pays('" . $value['payment'] . "',this,url_change_weight,url_back);"); $xtpl->assign('DATA_PM', $value); $xtpl->parse('main.payment.paymentloop'); - ++$a; + ++ $a; } $xtpl->assign('url_back', NV_BASE_ADMINURL . "index.php?" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=" . $op); $xtpl->assign('url_change', NV_BASE_ADMINURL . "index.php?" . NV_NAME_VARIABLE . "=" . $module_name . "&" . NV_OP_VARIABLE . "=changepay"); @@ -319,6 +322,21 @@ $xtpl->parse('main.payment'); } +$array_sortdefault = array( + 0 => $lang_module['setting_sortdefault_0'], + 1 => $lang_module['setting_sortdefault_1'], + 2 => $lang_module['setting_sortdefault_2'] +); +foreach ($array_sortdefault as $index => $value) { + $sl = $data['sortdefault'] == $index ? 'selected="selected"' : ''; + $xtpl->assign('SORTDEFAULT', array( + 'index' => $index, + 'value' => $value, + 'selected' => $sl + )); + $xtpl->parse('main.sortdefault'); +} + $xtpl->parse('main'); $contents .= $xtpl->text('main'); diff --git a/modules/shops/blocks/global.block_bxproduct_center.php b/modules/shops/blocks/global.block_bxproduct_center.php index f22d624e2..abeb763b4 100644 --- a/modules/shops/blocks/global.block_bxproduct_center.php +++ b/modules/shops/blocks/global.block_bxproduct_center.php @@ -22,14 +22,14 @@ */ function nv_block_config_bxproduct_center_blocks($module, $data_block, $lang_block) { - global $db_config, $site_mods; + global $db_config, $site_mods, $nv_Cache; $html = ""; $html .= " " . $lang_block['blockid'] . ""; $html .= " + + {LANG.setting_sortdefault} + + + +