From 15002099a876b42a606885b14689034ffae59d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Ng=E1=BB=8Dc=20Tri=E1=BB=83n?=
 <hongoctrien@vinades.vn>
Date: Tue, 25 Aug 2015 10:26:23 +0700
Subject: [PATCH 1/3] Update custom field

---
 modules/shops/admin.functions.php             |  2 --
 modules/shops/admin/content.php               |  1 -
 modules/shops/admin/field_tab.php             | 28 +++++++++++++------
 modules/shops/functions.php                   | 15 ++--------
 modules/shops/language/admin_vi.php           | 14 ++++------
 modules/shops/theme.php                       |  4 +--
 .../admin_default/modules/shops/field_tab.tpl |  3 +-
 .../default/modules/shops/tab_introduce.tpl   |  2 --
 8 files changed, 31 insertions(+), 38 deletions(-)
 delete mode 100644 themes/default/modules/shops/tab_introduce.tpl

diff --git a/modules/shops/admin.functions.php b/modules/shops/admin.functions.php
index ecbcdefb5..f6c641d4c 100644
--- a/modules/shops/admin.functions.php
+++ b/modules/shops/admin.functions.php
@@ -1191,10 +1191,8 @@ function nv_show_custom_form( $is_edit, $form, $array_custom )
  * @param mixed $idshop
  * @return
  */
-
 function Insertabl_catfields( $table, $array, $idshop )
 {
-
 	global $db, $module_name, $module_file, $db, $link, $module_info, $global_array_shops_cat, $global_config;
 
 	$result = $db->query( "SHOW COLUMNS FROM " . $table );
diff --git a/modules/shops/admin/content.php b/modules/shops/admin/content.php
index da64f3846..7602d6966 100644
--- a/modules/shops/admin/content.php
+++ b/modules/shops/admin/content.php
@@ -574,7 +574,6 @@
 					$idtemplate = $db->query( 'SELECT id FROM ' . $db_config['prefix'] . '_' . $module_data . '_template where alias = "' . preg_replace( "/[\_]/", "-", $global_array_shops_cat[$rowcontent['listcatid']]['form'] ) . '"' )->fetchColumn( );
 
 					$table_insert = $db_config['prefix'] . "_" . $module_data . "_info_" . $idtemplate;
-
 					Insertabl_catfields( $table_insert, $array_custom, $rowcontent['id'] );
 				}
 				if( !empty( $rowcontent['group_id'] ) )
diff --git a/modules/shops/admin/field_tab.php b/modules/shops/admin/field_tab.php
index 5abc48f67..8c556f599 100644
--- a/modules/shops/admin/field_tab.php
+++ b/modules/shops/admin/field_tab.php
@@ -13,7 +13,7 @@
 $table_name = $db_config['prefix'] . '_' . $module_data . '_tabs';
 
 $arr_tab = array( );
-$arr_tab['introduce'] = $lang_module['status_1'];
+$arr_tab['introduce'] = 'introduce';
 $sql = 'SELECT * FROM ' . $table_name . ' where content = ' . $db->quote( 'content_customdata' ) . ' ORDER BY weight ASC';
 $result = $db->query( $sql );
 $field_lang = nv_file_table( $table_name );
@@ -87,11 +87,15 @@
 
 if( $show_view )
 {
-	foreach( $arr_tab as $key => $value )
+	$arr_tab_tmp = $arr_tab;
+	$arr_tab_tmp['introduce'] = $lang_module['field_info_list'];
+	foreach( $arr_tab_tmp as $key => $value )
 	{
 		$xtpl->assign( 'title_tab', $value );
 		$xtpl->parse( 'main.view.title_tab' );
 	}
+	unset( $arr_tab_tmp );
+
 	while( $view = $sth->fetch( ) )
 	{
 		$arr_display_tab = unserialize( $view['tab'] );
@@ -180,16 +184,22 @@
 			}
 		}
 	}
+
 	foreach( $arr as $key => $value )// loai bo phan tu trung nhau
 	{
 		$arr_tab_tpl[$key] = array_unique( $value );
 	}
-	file_put_contents( NV_ROOTDIR . '/themes/default/modules/' . $module_file . '/tab_introduce.tpl', '', LOCK_EX );
+
+	if( !file_exists( NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/' . $module_name . '/files_tpl' ) )
+	{
+		nv_mkdir( NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/' . $module_name, 'files_tpl' );
+	}
+
 	foreach( $arr_tab_tpl as $key => $value )
 	{
-		$name_file = 'tab_' . str_replace( '-', '_', strtolower( change_alias( $arr_tab[$key] ) ) ) . '.tpl';
+		$name_file = 'tab-' . strtolower( change_alias( $arr_tab[$key] ) ) . '-' . NV_LANG_DATA .  '.tpl';
 		$html_tpl = "<!-- BEGIN: main -->\n";
-		$html_tpl .= "\t<ul>\n\n";
+		$html_tpl .= "\t<ul>\n";
 
 		foreach( $value as $key => $val )
 		{
@@ -197,13 +207,13 @@
 			$html_tpl .= "\t\t\t<li>\n";
 			$html_tpl .= "\t\t\t\t<p> <strong>{CUSTOM_LANG." . $val . "}:</strong> {CUSTOM_DATA." . $val . "}</p>\n";
 			$html_tpl .= "\t\t\t</li>\n";
-			$html_tpl .= "\t\t<!-- END: " . $val . " -->\n\n";
+			$html_tpl .= "\t\t<!-- END: " . $val . " -->\n";
 		}
 
-		$html_tpl .= "\t<ul>\n";
+		$html_tpl .= "\t</ul>\n";
 		$html_tpl .= "<!-- END: main -->";
 
-		file_put_contents( NV_ROOTDIR . '/themes/default/modules/' . $module_file . '/' . $name_file, $html_tpl, LOCK_EX );
+		file_put_contents( NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/' . $module_name . '/files_tpl/' . $name_file, $html_tpl, LOCK_EX );
 	}
 	Header( 'Location:' . NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=template' );
 	exit ;
@@ -211,4 +221,4 @@
 
 include NV_ROOTDIR . '/includes/header.php';
 echo nv_admin_theme( $contents );
-include NV_ROOTDIR . '/includes/footer.php';
+include NV_ROOTDIR . '/includes/footer.php';
\ No newline at end of file
diff --git a/modules/shops/functions.php b/modules/shops/functions.php
index 9de3a8b4a..5a9620991 100644
--- a/modules/shops/functions.php
+++ b/modules/shops/functions.php
@@ -335,7 +335,7 @@ function SetSessionProView( $id, $title, $alias, $addtime, $link, $homeimgthumb
  */
 function nv_custom_tpl( $name_file, $array_custom, $array_custom_lang, $idtemplate )
 {
-	global $module_data, $module_info, $module_file, $lang_module, $db_config, $db, $global_config;
+	global $module_data, $module_info, $module_name, $module_file, $lang_module, $db_config, $db, $global_config;
 
 	$sql = 'SELECT * FROM ' . $db_config['prefix'] . '_' . $module_data . '_field';
 	$result = $db->query( $sql );
@@ -353,18 +353,9 @@ function nv_custom_tpl( $name_file, $array_custom, $array_custom_lang, $idtempla
 			}
 		}
 	}
-	$html ='';
-
-	if( file_exists( NV_ROOTDIR . '/themes/' . $global_config['module_theme'] . '/modules/' . $module_file . '/' . $name_file ) )
-	{
-		$theme_tpl = $global_config['module_theme'];
-	}
-	else
-	{
-		$theme_tpl = 'default';
-	}
 
-	$xtpl = new XTemplate( $name_file, NV_ROOTDIR . '/themes/' . $theme_tpl . '/modules/' . $module_file );
+	$html ='';
+	$xtpl = new XTemplate( $name_file, NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/files_tpl/' . $module_name );
 	$xtpl->assign( 'CUSTOM_LANG', $array_custom_lang );
 	$xtpl->assign( 'CUSTOM_DATA', $array_custom );
 	$count = 0;
diff --git a/modules/shops/language/admin_vi.php b/modules/shops/language/admin_vi.php
index 321179f0c..5b9b7bb0c 100644
--- a/modules/shops/language/admin_vi.php
+++ b/modules/shops/language/admin_vi.php
@@ -131,6 +131,7 @@
 $lang_module['setting_facebookAppID'] = 'Facebook App ID';
 $lang_module['setting_facebookAppIDNote'] = ' (Có dạng 1419186468293063, <a href="http://wiki.nukeviet.vn/nukeviet:admin:news:facebookapi" target="_blank">xem chi tiết</a>)';
 $lang_module['setting_socialbutton'] = 'Hiển thị các công cụ Like facebook, G+, Twitter khi xem bài viết';
+$lang_module['template_setting_active'] = 'Sử dụng chức Tùy biến dữ liệu';
 $lang_module['setup_payment'] = 'Tích hợp cổng thanh toán';
 $lang_module['setup_payment_guide'] = 'Xem hướng dẫn Tích hợp cổng thanh toán';
 $lang_module['setting_stt'] = 'STT';
@@ -566,6 +567,7 @@
 
 //field
 $lang_module['fields'] = 'Tùy biến dữ liệu';
+$lang_module['field_tab_page'] = 'Cấu hình hiển thị dữ liệu tùy biến';
 $lang_module['captionform_add'] = 'Thêm trường dữ liệu';
 $lang_module['captionform_edit'] = 'Sửa trường dữ liệu';
 $lang_module['field_edit'] = 'Sửa';
@@ -617,6 +619,8 @@
 $lang_module['field_number'] = 'STT';
 $lang_module['field_value'] = 'Giá trị';
 $lang_module['field_text'] = 'Miêu tả';
+$lang_module['field_info_list'] = 'Thông tin sản phẩm';
+$lang_module['field_info_list_note'] = 'Hiển thị trong phần thông tin sản phẩm';
 $lang_module['field_add_choice'] = 'Thêm lựa chọn';
 $lang_module['field_date_error'] = 'Giá trị của Min Date cần nhỏ hơn Max Date';
 $lang_module['field_number_error'] = 'Giá trị của Min Value cần nhỏ hơn Max Value';
@@ -679,8 +683,6 @@
 $lang_module['download_setting_groups'] = 'Ai được phép tải tập tin';
 $lang_module['download_setting_groups_module'] = 'Theo cấu hình module';
 
-$lang_module['template_setting_active'] = 'Sử dụng chức Tùy biến dữ liệu';
-
 //Lang for function tabs
 $lang_module['tabs'] = 'Quản lý tab';
 $lang_module['tabs_icon'] = 'Biểu tượng';
@@ -693,10 +695,6 @@
 $lang_module['tabs_content_customdata'] = 'Dữ liệu tùy biến';
 $lang_module['error_required_content'] = 'Lỗi: bạn cần nhập dữ liệu cho Nội dung';
 
-//Lang for function field
-$lang_module['field_tab_page'] = 'Hiển thị dữ liệu cho tab';
-$lang_module['introduce'] = 'Giới thiệu';
-
-$lang_module['updateprice']='Cập nhật giá theo loại';
+$lang_module['updateprice'] = 'Cập nhật giá theo loại';
 $lang_module['cateid'] = 'Loại sản phẩm';
-$lang_module['newprice'] = 'Giá mới';
+$lang_module['newprice'] = 'Giá mới';
\ No newline at end of file
diff --git a/modules/shops/theme.php b/modules/shops/theme.php
index 5b96a05b8..67a2b9833 100644
--- a/modules/shops/theme.php
+++ b/modules/shops/theme.php
@@ -1340,7 +1340,7 @@ function detail_product( $data_content, $data_unit, $data_others, $array_other_v
 		// Hien thi du lieu tuy bien o phan gioi thieu
 		if( !empty( $data_content['array_custom'] ) and !empty( $data_content['array_custom_lang'] ) )
 		{
-			$custom_data = nv_custom_tpl( 'tab_introduce.tpl', $data_content['array_custom'], $data_content['array_custom_lang'], $idtemplate );
+			$custom_data = nv_custom_tpl( 'tab-introduce-' . NV_LANG_DATA . '.tpl', $data_content['array_custom'], $data_content['array_custom_lang'], $idtemplate );
 			$xtpl->assign( 'CUSTOM_DATA', $custom_data );
 			$xtpl->parse( 'main.custom_data' );
 
@@ -1409,7 +1409,7 @@ function detail_product( $data_content, $data_unit, $data_others, $array_other_v
 					{
 						if( !empty( $data_content['array_custom'] ) and !empty( $data_content['array_custom_lang'] ) )
 						{
-							$tabs_content = nv_custom_tpl( 'tab_' . str_replace( '-', '_', strtolower( change_alias( $data_content['tabs'][$tabs_id][NV_LANG_DATA.'_title'] ) ) ) . '.tpl', $data_content['array_custom'], $data_content['array_custom_lang'], $idtemplate );
+							$tabs_content = nv_custom_tpl( 'tab-' . strtolower( change_alias( $data_content['tabs'][$tabs_id][NV_LANG_DATA.'_title'] ) ) . '-' . NV_LANG_DATA . '.tpl', $data_content['array_custom'], $data_content['array_custom_lang'], $idtemplate );
 						}
 					}
 
diff --git a/themes/admin_default/modules/shops/field_tab.tpl b/themes/admin_default/modules/shops/field_tab.tpl
index b4d4e1dde..72945a8f6 100644
--- a/themes/admin_default/modules/shops/field_tab.tpl
+++ b/themes/admin_default/modules/shops/field_tab.tpl
@@ -7,7 +7,6 @@
 			<colgroup>
 				<col class="w100" />
 				<col />
-				<col class="w100" />
 			</colgroup>
 			<thead>
 				<tr>
@@ -29,7 +28,7 @@
 					</select></td>
 					<td> {VIEW.field} </td>
 					<!-- BEGIN: tab -->
-					<td class="text-center"><input type="checkbox" name="check[{VIEW.fid}][{tab}]" value="{tab}" {CHECK} /></td>
+					<td class="text-center w200"><input type="checkbox" name="check[{VIEW.fid}][{tab}]" value="{tab}" {CHECK} /></td>
 					<!-- END: tab -->
 				</tr>
 				<!-- END: loop -->
diff --git a/themes/default/modules/shops/tab_introduce.tpl b/themes/default/modules/shops/tab_introduce.tpl
deleted file mode 100644
index 305b07262..000000000
--- a/themes/default/modules/shops/tab_introduce.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- BEGIN: main -->
-<!-- END: main -->
\ No newline at end of file

From 0825fe29f2b33c8d0b5aae21e8f1337f3df02bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Ng=E1=BB=8Dc=20Tri=E1=BB=83n?=
 <hongoctrien@vinades.vn>
Date: Tue, 25 Aug 2015 10:30:02 +0700
Subject: [PATCH 2/3] Update custom field

---
 modules/shops/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/shops/functions.php b/modules/shops/functions.php
index 5a9620991..179f2df8e 100644
--- a/modules/shops/functions.php
+++ b/modules/shops/functions.php
@@ -355,7 +355,7 @@ function nv_custom_tpl( $name_file, $array_custom, $array_custom_lang, $idtempla
 	}
 
 	$html ='';
-	$xtpl = new XTemplate( $name_file, NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/files_tpl/' . $module_name );
+	$xtpl = new XTemplate( $name_file, NV_ROOTDIR . '/' . NV_ASSETS_DIR . '/' . $module_name . '/files_tpl' );
 	$xtpl->assign( 'CUSTOM_LANG', $array_custom_lang );
 	$xtpl->assign( 'CUSTOM_DATA', $array_custom );
 	$count = 0;

From 5a383834ae1d12bd65867cde840cd29943d941b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Ng=E1=BB=8Dc=20Tri=E1=BB=83n?=
 <hongoctrien@vinades.vn>
Date: Tue, 25 Aug 2015 13:40:29 +0700
Subject: [PATCH 3/3] Fix change template groups

---
 modules/shops/admin/template.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/shops/admin/template.php b/modules/shops/admin/template.php
index b60934685..8e0c21c3c 100644
--- a/modules/shops/admin/template.php
+++ b/modules/shops/admin/template.php
@@ -59,16 +59,19 @@
 
 	$data['title'] = nv_substr( $nv_Request->get_title( 'title', 'post', '' ), 0, 50 );
 	$data['alias'] = strtolower( change_alias( $data['title'] ) );
-	$stmt = $db->query( 'SELECT * FROM ' . $db_config['prefix'] . '_' . $module_data . '_template where alias=' . $db->quote( $data['alias'] ) )->fetchColumn( );
 
-	if( empty( $data['title'] ) )
+	$count = $db->query( 'SELECT * FROM ' . $db_config['prefix'] . '_' . $module_data . '_template where alias=' . $db->quote( $data['alias'] ) . ' AND id!=' . $data['id'] )->fetchColumn();
+	if( $count > 0 )
 	{
-		$error = $lang_module['template_error_name'];
+		$_tem_id = $db->query( 'SELECT MAX(id) FROM ' . $db_config['prefix'] . '_' . $module_data . '_template WHERE alias=' . $db->quote( $data['alias'] ) )->fetchColumn();
+		$data['alias'] = $data['alias'] . '-' . $_tem_id;
 	}
-	elseif( !empty( $stmt ) )
+
+	if( empty( $data['title'] ) )
 	{
-		$error = $lang_module['block_error_alias'];
+		$error = $lang_module['template_error_name'];
 	}
+
 	else
 	{
 		if( $data['id'] == 0 )