From 2f11637d43aca1920983f63e4a269f1a1f60314b Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 8 Aug 2013 11:53:35 +0900 Subject: [PATCH 1/5] =?UTF-8?q?#273=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/list.php | 13 +++++++++++++ shop/list.sort.php | 2 ++ 2 files changed, 15 insertions(+) diff --git a/shop/list.php b/shop/list.php index 9f8a8a51a..0c5e2ad4b 100644 --- a/shop/list.php +++ b/shop/list.php @@ -115,6 +115,19 @@ if ($is_admin) } ?> + + '.stripslashes($ca['ca_tail_html']).''; diff --git a/shop/list.sort.php b/shop/list.sort.php index 5432ee54d..4867bd4ae 100644 --- a/shop/list.sort.php +++ b/shop/list.sort.php @@ -30,8 +30,10 @@ $(function() { $("button.sct_lst_view").on("click", function() { if($(this).hasClass("sct_lst_gallery")) { $("ul.sct").removeClass("sct_13"); + set_cookie("ck_itemlist_type", "gallery", 1, g4_cookie_domain); } else { $("ul.sct").addClass("sct_13"); + set_cookie("ck_itemlist_type", "list", 1, g4_cookie_domain); } }); }); From 9fdf869dd7dd8cc35b0077c93615ab79dcb4b900 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 8 Aug 2013 13:15:51 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EC=97=90=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=EB=AA=85=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/install/install_db.php b/install/install_db.php index 276ece8a9..960713bc3 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -201,59 +201,61 @@ if($shop_install) { de_admin_company_addr = 'OO도 OO시 OO구 OO동 123-45', de_admin_info_name = '정보책임자명', de_admin_info_email = '정보책임자 E-mail', + de_shop_skin = 'basic', + de_shop_mobile_skin = 'basic', de_type1_list_use = '1', - de_type1_list_skin = 'maintype10.inc.php', + de_type1_list_skin = 'main.10.skin.php', de_type1_list_mod = '3', de_type1_list_row = '2', de_type1_img_width = '$mimg_width', de_type1_img_height = '$mimg_height', de_type2_list_use = '1', - de_type2_list_skin = 'maintype10.inc.php', + de_type2_list_skin = 'main.10.skin.php', de_type2_list_mod = '3', de_type2_list_row = '2', de_type2_img_width = '$mimg_width', de_type2_img_height = '$mimg_height', de_type3_list_use = '1', - de_type3_list_skin = 'maintype10.inc.php', + de_type3_list_skin = 'main.10.skin.php', de_type3_list_mod = '1', de_type3_list_row = '3', de_type3_img_width = '$mimg_width', de_type3_img_height = '$mimg_height', de_type4_list_use = '1', - de_type4_list_skin = 'maintype10.inc.php', + de_type4_list_skin = 'main.10.skin.php', de_type4_list_mod = '3', de_type4_list_row = '1', de_type4_img_width = '$mimg_width', de_type4_img_height = '$mimg_height', de_type5_list_use = '1', - de_type5_list_skin = 'maintype10.inc.php', + de_type5_list_skin = 'main.10.skin.php', de_type5_list_mod = '3', de_type5_list_row = '1', de_type5_img_width = '$mimg_width', de_type5_img_height = '$mimg_height', de_mobile_type1_list_use = '1', - de_mobile_type1_list_skin = 'maintype10.inc.php', - de_mobile_type1_list_row = '3', + de_mobile_type1_list_skin = 'main.10.skin.php', + de_mobile_type1_list_mod = '3', de_mobile_type1_img_width = '$mimg_width', de_mobile_type1_img_height = '$mimg_height', de_mobile_type2_list_use = '1', - de_mobile_type2_list_skin = 'maintype10.inc.php', - de_mobile_type2_list_row = '3', + de_mobile_type2_list_skin = 'main.10.skin.php', + de_mobile_type2_list_mod = '3', de_mobile_type2_img_width = '$mimg_width', de_mobile_type2_img_height = '$mimg_height', de_mobile_type3_list_use = '1', - de_mobile_type3_list_skin = 'maintype10.inc.php', - de_mobile_type3_list_row = '3', + de_mobile_type3_list_skin = 'main.10.skin.php', + de_mobile_type3_list_mod = '3', de_mobile_type3_img_width = '$mimg_width', de_mobile_type3_img_height = '$mimg_height', de_mobile_type4_list_use = '1', - de_mobile_type4_list_skin = 'maintype10.inc.php', - de_mobile_type4_list_row = '3', + de_mobile_type4_list_skin = 'main.10.skin.php', + de_mobile_type4_list_mod = '3', de_mobile_type4_img_width = '$mimg_width', de_mobile_type4_img_height = '$mimg_height', de_mobile_type5_list_use = '1', - de_mobile_type5_list_skin = 'maintype10.inc.php', - de_mobile_type5_list_row = '3', + de_mobile_type5_list_skin = 'main.10.skin.php', + de_mobile_type5_list_mod = '3', de_mobile_type5_img_width = '$mimg_width', de_mobile_type5_img_height = '$mimg_height', de_bank_use = '1', From 21e5ac6108f167c1a1d08d99fd3bd1bcd5836dc3 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 8 Aug 2013 13:37:27 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=A0=95=EB=A0=AC=EC=88=9C=EC=84=9C?= =?UTF-8?q?=EA=B0=80=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20qstr=20=EC=97=90?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/list.php | 2 +- shop/event.php | 2 +- shop/list.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/shop/list.php b/mobile/shop/list.php index 3b0aa2340..3714d08ed 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -107,7 +107,7 @@ if ($is_admin) $qstr1 .= 'ca_id='.$ca_id; if($skin) $qstr1 .= '&skin='.$skin; -$qstr1 .='&ev_id='.$ev_id.'&sort='.$sort.'&sortodr='.$sortodr; +$qstr1 .='&sort='.$sort.'&sortodr='.$sortodr; echo get_paging($config['cf_mobile_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&page='); ?> diff --git a/shop/event.php b/shop/event.php index 702ebbb37..88418bf9a 100644 --- a/shop/event.php +++ b/shop/event.php @@ -72,7 +72,7 @@ if ($i==0) ?> diff --git a/shop/list.php b/shop/list.php index 0c5e2ad4b..c0d18bd39 100644 --- a/shop/list.php +++ b/shop/list.php @@ -143,7 +143,7 @@ if ($is_admin) $qstr1 .= 'ca_id='.$ca_id; if($skin) $qstr1 .= '&skin='.$skin; -$qstr1 .='&ev_id='.$ev_id.'&sort='.$sort.'&sortodr='.$sortodr; +$qstr1 .='&sort='.$sort.'&sortodr='.$sortodr; echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&page='); ?> From 0da7ccb589c48fc016c5f0271ec504b76095b803 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 8 Aug 2013 14:25:58 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=83=81=ED=92=88=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=9C=A0=ED=98=95=20=EB=B3=80=EA=B2=BD=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=A5=BC=20=ED=8C=8C=EC=9D=BC=EC=97=90=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=ED=95=B4=EC=84=9C=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/list.php | 16 ++++++++-------- shop/event.php | 6 ++++++ shop/list.php | 33 +++++++++++++-------------------- shop/list.sort.php | 24 ++++++------------------ shop/list.sub.php | 19 +++---------------- shop/list.sub2.php | 28 ++++++++++++++++++++++++++++ shop/listtype.php | 7 +++++++ 7 files changed, 71 insertions(+), 62 deletions(-) create mode 100644 shop/list.sub2.php diff --git a/mobile/shop/list.php b/mobile/shop/list.php index 3714d08ed..8687a605f 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -97,20 +97,20 @@ if ($is_admin) } ?> + + '.stripslashes($ca['ca_mobile_tail_html']).''; ?> - - diff --git a/shop/list.php b/shop/list.php index c0d18bd39..d3ce794a4 100644 --- a/shop/list.php +++ b/shop/list.php @@ -75,6 +75,9 @@ if ($is_admin) if (file_exists($list_file)) { include G4_SHOP_PATH.'/list.sort.php'; + // 상품 보기 타입 변경 버튼 + include G4_SHOP_PATH.'/list.sub.php'; + // 총몇개 = 한줄에 몇개 * 몇줄 $items = $ca['ca_list_mod'] * $ca['ca_list_row']; // 페이지가 없으면 첫 페이지 (1 페이지) @@ -115,18 +118,16 @@ if ($is_admin) } ?> - + '; ?> - - @@ -21,21 +25,5 @@ $sct_sort_href .= '&ev_id='.$ev_id.'&sort=';
  • 인기상품
  • 할인상품
    • - - - - \ No newline at end of file diff --git a/shop/list.sub.php b/shop/list.sub.php index c549d7803..5be29ebc2 100644 --- a/shop/list.sub.php +++ b/shop/list.sub.php @@ -1,19 +1,6 @@ 태그 폭 -$td_width = (int)(100 / $list_mod); - -$sql = "select COUNT(*) as cnt $sql_common "; -$row = sql_fetch($sql); -$total_count = $row['cnt']; - -// 전체 페이지 계산 -$total_page = ceil($total_count / $items); -// 페이지가 없으면 첫 페이지 (1 페이지) -if ($page == "") $page = 1; -// 시작 레코드 구함 -$from_record = ($page - 1) * $items; ?> + + + \ No newline at end of file diff --git a/shop/list.sub2.php b/shop/list.sub2.php new file mode 100644 index 000000000..84986a469 --- /dev/null +++ b/shop/list.sub2.php @@ -0,0 +1,28 @@ + + + \ No newline at end of file diff --git a/shop/listtype.php b/shop/listtype.php index e88f499aa..d128282ce 100644 --- a/shop/listtype.php +++ b/shop/listtype.php @@ -55,6 +55,13 @@ if (file_exists($list_file)) { $list->set_is_page(true); $list->set_order_by($order_by); $list->set_from_record($from_record); + $list->set_view('it_img', true); + $list->set_view('it_id', false); + $list->set_view('it_name', true); + $list->set_view('it_cust_price', false); + $list->set_view('it_price', true); + $list->set_view('it_icon', true); + $list->set_view('sns', true); echo $list->run(); // where 된 전체 상품수 From 8c5e956aeae6392f9de19410a46b1f07dcda0c07 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 8 Aug 2013 14:27:46 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EB=93=B1=EC=9D=98=20=EC=B6=9C=EB=A0=A5=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/event.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shop/event.php b/shop/event.php index a97c6dc2b..90b936384 100644 --- a/shop/event.php +++ b/shop/event.php @@ -54,6 +54,13 @@ if (file_exists($list_file)) $list->set_is_page(true); $list->set_order_by($order_by); $list->set_from_record($from_record); + $list->set_view('it_img', true); + $list->set_view('it_id', false); + $list->set_view('it_name', true); + $list->set_view('it_cust_price', false); + $list->set_view('it_price', true); + $list->set_view('it_icon', true); + $list->set_view('sns', true); echo $list->run(); // where 된 전체 상품수