From 80af2a0f8c639f515c53246af866246f29787e3f Mon Sep 17 00:00:00 2001 From: kagla Date: Tue, 21 Jan 2014 13:40:42 +0900 Subject: [PATCH 01/10] =?UTF-8?q?/.htaccess=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 96ca0ceec..8b781d5d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ !.gitignore -.htaccess +/.htaccess data/ test/ sirgle/ From 336ebbd3965ee8960b4ccd0e7ca948bc9beb3ae8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 21 Jan 2014 14:10:41 +0900 Subject: [PATCH 02/10] =?UTF-8?q?#361=20=EC=8B=A0=EC=9A=A9=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=20=EB=AC=B4=EC=9D=B4=EC=9E=90=ED=95=A0=EB=B6=80=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 16 ++++++++++++++++ adm/shop_admin/configformupdate.php | 1 + install/gnuboard5shop.sql | 1 + mobile/shop/kcp/order_approval_form.php | 1 + mobile/shop/orderform.php | 1 + shop/orderform.php | 2 ++ 6 files changed, 22 insertions(+) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 657365d0f..f2a8b5c57 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -43,6 +43,12 @@ if(!isset($default['de_root_index_use'])) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` ADD `de_root_index_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_admin_info_email` ", true); } + +// 무이자 할부 사용설정 필드 추가 +if(!isset($default['de_card_noint_use'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` + ADD `de_card_noint_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_card_use` ", true); +} ?>
@@ -473,6 +479,16 @@ if(!isset($default['de_root_index_use'])) { + + + + 사용으로 설정하시면 KCP 가맹점 관리자 페이지에서 설정하신 무이자할부 설정이 적용됩니다.
사용안함으로 설정하시면 KCP 무이자 이벤트 카드를 제외한 모든 카드의 무이자 설정이 적용되지 않습니다.", 50); ?> + + + diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index c0cc2ef09..c69943565 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -109,6 +109,7 @@ $sql = " update {$g5['g5_shop_default_table']} de_bank_account = '$de_bank_account', de_card_test = '$de_card_test', de_card_use = '$de_card_use', + de_card_noint_use = '$de_card_noint_use', de_card_point = '$de_card_point', de_settle_min_point = '$de_settle_min_point', de_settle_max_point = '$de_settle_max_point', diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 8e136507a..26b0cc456 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -269,6 +269,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_bank_account` text NOT NULL, `de_card_test` int(11) NOT NULL DEFAULT '0', `de_card_use` int(11) NOT NULL DEFAULT '0', + `de_card_noint_use` tinyint(4) NOT NULL DEFAULT '0', `de_card_point` int(11) NOT NULL DEFAULT '0', `de_settle_min_point` int(11) NOT NULL DEFAULT '0', `de_settle_max_point` int(11) NOT NULL DEFAULT '0', diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php index 3d1ddfb54..54a637e7d 100644 --- a/mobile/shop/kcp/order_approval_form.php +++ b/mobile/shop/kcp/order_approval_form.php @@ -297,6 +297,7 @@ BC 2,3,6개월, 국민 3,6개월, 삼성 6,9개월 무이자 : CCBC-02:03:06,CCKM-03:06,CCSS-03:06:04 */ --> + */ --> + + + Date: Tue, 21 Jan 2014 16:57:06 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=87=BC=ED=95=91=EB=AA=B0=20head,=20tail?= =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EB=8A=94=20=EC=84=A4=EC=A0=95=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 --- _common.php | 2 +- _head.php | 5 ++++- _tail.php | 5 ++++- adm/shop_admin/configform.php | 16 ++++++++++++++++ adm/shop_admin/configformupdate.php | 1 + bbs/_common.php | 7 +++++++ install/gnuboard5shop.sql | 1 + mobile/_head.php | 5 ++++- mobile/_tail.php | 5 ++++- mobile/shop/index.php | 6 +++--- mobile/shop/shop.head.php | 2 ++ shop/_head.php | 6 +++++- shop/_tail.php | 6 +++++- shop/index.php | 3 --- shop/shop.head.php | 1 + 15 files changed, 58 insertions(+), 13 deletions(-) diff --git a/_common.php b/_common.php index 0da77b7c1..8d16d0880 100644 --- a/_common.php +++ b/_common.php @@ -1,7 +1,7 @@ 쇼핑몰 설치 후 이용해 주십시오.

'); diff --git a/_head.php b/_head.php index 79e267fb7..a0558a12a 100644 --- a/_head.php +++ b/_head.php @@ -1,5 +1,8 @@ \ No newline at end of file diff --git a/_tail.php b/_tail.php index ae47c3b51..d5ba5c009 100644 --- a/_tail.php +++ b/_tail.php @@ -1,5 +1,8 @@ \ No newline at end of file diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index f2a8b5c57..737d2e762 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -49,6 +49,12 @@ if(!isset($default['de_card_noint_use'])) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` ADD `de_card_noint_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_card_use` ", true); } + +// 레이아웃 선택 설정 필드추가 +if(!isset($default['de_shop_layout_use'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` + ADD `de_shop_layout_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_root_index_use` ", true); +} ?> @@ -737,6 +743,16 @@ if(!isset($default['de_card_noint_use'])) { + + + + + + + 관련상품출력 diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index c69943565..e91235647 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -34,6 +34,7 @@ $sql = " update {$g5['g5_shop_default_table']} de_admin_info_name = '$de_admin_info_name', de_admin_info_email = '$de_admin_info_email', de_root_index_use = '$de_root_index_use', + de_shop_layout_use = '$de_shop_layout_use', de_shop_skin = '$de_shop_skin', de_shop_mobile_skin = '$de_shop_mobile_skin', de_type1_list_use = '$de_type1_list_use', diff --git a/bbs/_common.php b/bbs/_common.php index b556cc9d3..c53246a99 100644 --- a/bbs/_common.php +++ b/bbs/_common.php @@ -1,3 +1,10 @@ 쇼핑몰 설치 후 이용해 주십시오.

'); + + define('_SHOP_', true); +} ?> \ No newline at end of file diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 26b0cc456..eb2ca00ea 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -194,6 +194,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_admin_info_name` varchar(255) NOT NULL DEFAULT '', `de_admin_info_email` varchar(255) NOT NULL DEFAULT '', `de_root_index_use` tinyint(4) NOT NULL DEFAULT '0', + `de_shop_layout_use` tinyint(4) NOT NULL DEFAULT '0', `de_shop_skin` varchar(255) NOT NULL DEFAULT '', `de_shop_mobile_skin` varchar(255) NOT NULL DEFAULT '', `de_type1_list_use` tinyint(4) NOT NULL DEFAULT '0', diff --git a/mobile/_head.php b/mobile/_head.php index 6f97d69de..f85e42763 100644 --- a/mobile/_head.php +++ b/mobile/_head.php @@ -1,5 +1,8 @@ \ No newline at end of file diff --git a/mobile/_tail.php b/mobile/_tail.php index c9cb4b7c7..7cca285ef 100644 --- a/mobile/_tail.php +++ b/mobile/_tail.php @@ -1,5 +1,8 @@ \ No newline at end of file diff --git a/mobile/shop/index.php b/mobile/shop/index.php index 0186a4c9b..81620c124 100644 --- a/mobile/shop/index.php +++ b/mobile/shop/index.php @@ -1,9 +1,9 @@ @@ -158,5 +158,5 @@ $(function() { \ No newline at end of file diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php index 2cefa06b4..fe79800b7 100644 --- a/mobile/shop/shop.head.php +++ b/mobile/shop/shop.head.php @@ -2,9 +2,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 include_once(G5_PATH.'/head.sub.php'); +include_once(G5_LIB_PATH.'/outlogin.lib.php'); include_once(G5_LIB_PATH.'/visit.lib.php'); include_once(G5_LIB_PATH.'/connect.lib.php'); include_once(G5_LIB_PATH.'/popular.lib.php'); +include_once(G5_LIB_PATH.'/latest.lib.php'); ?>
diff --git a/shop/_head.php b/shop/_head.php index dfcef8a8d..96f125286 100644 --- a/shop/_head.php +++ b/shop/_head.php @@ -1,4 +1,8 @@ \ No newline at end of file diff --git a/shop/_tail.php b/shop/_tail.php index cf2d7a276..d2327ec8a 100644 --- a/shop/_tail.php +++ b/shop/_tail.php @@ -1,4 +1,8 @@ \ No newline at end of file diff --git a/shop/index.php b/shop/index.php index 13acc7970..8dfad6637 100644 --- a/shop/index.php +++ b/shop/index.php @@ -8,9 +8,6 @@ if (G5_IS_MOBILE) { define("_INDEX_", TRUE); -include_once(G5_LIB_PATH.'/latest.lib.php'); -include_once(G5_LIB_PATH.'/poll.lib.php'); - include_once(G5_SHOP_PATH.'/shop.head.php'); ?> diff --git a/shop/shop.head.php b/shop/shop.head.php index 3ca3bb27c..946306dc7 100644 --- a/shop/shop.head.php +++ b/shop/shop.head.php @@ -7,6 +7,7 @@ include_once(G5_LIB_PATH.'/poll.lib.php'); include_once(G5_LIB_PATH.'/visit.lib.php'); include_once(G5_LIB_PATH.'/connect.lib.php'); include_once(G5_LIB_PATH.'/popular.lib.php'); +include_once(G5_LIB_PATH.'/latest.lib.php'); ?> From 2bdee0f848eabe06aab0080d06feb38ab7be6263 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 12:46:21 +0900 Subject: [PATCH 04/10] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98=20=ED=9C=B4?= =?UTF-8?q?=EB=8C=80=ED=8F=B0=EB=B2=88=ED=98=B8=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EC=97=90=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95=20-=20I2sec=20=EC=A7=80=EB=AF=BC?= =?UTF-8?q?=EA=B1=B4=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/qawrite_update.php | 3 +++ mobile/skin/qa/basic/write.skin.php | 10 +++++++++- skin/qa/basic/write.skin.php | 10 +++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php index 396080891..c6fde25d5 100644 --- a/bbs/qawrite_update.php +++ b/bbs/qawrite_update.php @@ -33,6 +33,9 @@ if (!empty($msg)) { alert($msg); } +if($qa_hp) + $qa_hp = preg_replace('/[^0-9\-]/', '', strip_tags($qa_hp)); + // 090710 if (substr_count($qa_content, '&#') > 50) { alert('내용에 올바르지 않은 코드가 다수 포함되어 있습니다.'); diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php index c7fa1e568..afd1a6ef4 100644 --- a/mobile/skin/qa/basic/write.skin.php +++ b/mobile/skin/qa/basic/write.skin.php @@ -63,7 +63,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - class="frm_input" size="30"> + class="frm_input" size="30"> > 답변등록 SMS알림 수신 @@ -166,6 +166,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 return false; } + + var hp = f.qa_hp.value.replace(/[0-9\-]/g, ""); + if(hp.length > 0) { + alert("휴대폰번호는 숫자, - 으로만 입력해 주십시오."); + return false; + } + + document.getElementById("btn_submit").disabled = "disabled"; return true; diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php index 817e8f943..e34181369 100644 --- a/skin/qa/basic/write.skin.php +++ b/skin/qa/basic/write.skin.php @@ -63,7 +63,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - class="frm_input" size="30"> + class="frm_input" size="30"> > 답변등록 SMS알림 수신 @@ -166,6 +166,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 return false; } + + var hp = f.qa_hp.value.replace(/[0-9\-]/g, ""); + if(hp.length > 0) { + alert("휴대폰번호는 숫자, - 으로만 입력해 주십시오."); + return false; + } + + document.getElementById("btn_submit").disabled = "disabled"; return true; From 8b308577018d5944a977610bd24014f602953b82 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 13:15:06 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=B3=B5?= =?UTF-8?q?=EC=82=AC=EC=8B=9C=20=EA=B8=B0=EB=B3=B8=20=EC=97=94=EC=A7=84=20?= =?UTF-8?q?MyISAM=20=EC=84=A4=EC=A0=95=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index cd8d079ab..c32b97f4e 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1531,7 +1531,7 @@ function get_table_define($table, $crlf="\n") $schema_create .= implode($columns, ', ') . ')'; } // end while - $schema_create .= $crlf . ') DEFAULT CHARSET=utf8'; + $schema_create .= $crlf . ') ENGINE=MyISAM DEFAULT CHARSET=utf8'; return $schema_create; } // end of the 'PMA_getTableDef()' function From b675b026040db4fcc6eae624850e7dda9be86a14 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 13:36:24 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=EB=A9=94=EB=AA=A8=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20me=5Frecv=5Fmb=5Fid=EC=97=90=20=EC=9D=B8=EB=8D=B1?= =?UTF-8?q?=EC=8A=A4=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EC=8D=AC=EC=93=B0=ED=8C=8C=EB=8D=94=EB=8B=98=20=EA=B1=B4?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/gnuboard5.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index dbfcb56a5..5b1177987 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -507,7 +507,8 @@ CREATE TABLE IF NOT EXISTS `g5_memo` ( `me_send_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `me_read_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `me_memo` text NOT NULL, - PRIMARY KEY (`me_id`) + PRIMARY KEY (`me_id`), + KEY `me_recv_mb_id` (`me_recv_mb_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- From fb68abcfefb15f12466701506bc338ab1d7f8ca4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 14:48:12 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A9=94=EC=9D=BC?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=98=B5=EC=85=98=EC=9D=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=EA=B8=88=EC=95=A1=EC=9D=B4=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/mail/orderupdate1.mail.php | 8 ++++---- shop/mail/orderupdate2.mail.php | 8 ++++---- shop/mail/orderupdate3.mail.php | 8 ++++---- shop/ordermail1.inc.php | 7 +++++-- shop/ordermail2.inc.php | 7 +++++-- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/shop/mail/orderupdate1.mail.php b/shop/mail/orderupdate1.mail.php index d5a2f3c09..2d38c1fca 100644 --- a/shop/mail/orderupdate1.mail.php +++ b/shop/mail/orderupdate1.mail.php @@ -40,14 +40,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 상품명 - - 선택옵션 - - 판매가격 + + 선택옵션 + + 소계 diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php index d246c5f40..cf9e985c7 100644 --- a/shop/mail/orderupdate2.mail.php +++ b/shop/mail/orderupdate2.mail.php @@ -40,14 +40,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 상품명 - - 선택옵션 - - 판매가격 + + 선택옵션 + + 소계 diff --git a/shop/mail/orderupdate3.mail.php b/shop/mail/orderupdate3.mail.php index 54855458b..0c12420a5 100644 --- a/shop/mail/orderupdate3.mail.php +++ b/shop/mail/orderupdate3.mail.php @@ -39,14 +39,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 상품명 - - 선택옵션 - - 판매가격 + + 선택옵션 + + diff --git a/shop/ordermail1.inc.php b/shop/ordermail1.inc.php index 8c84590e0..ed2604ff3 100644 --- a/shop/ordermail1.inc.php +++ b/shop/ordermail1.inc.php @@ -36,7 +36,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) $sum = sql_fetch($sql); // 옵션정보 - $sql2 = " select ct_option, ct_qty + $sql2 = " select ct_option, ct_qty, io_price from {$g5['g5_shop_cart_table']} where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1' order by io_type asc, ct_id asc "; @@ -48,7 +48,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) for($k=0; $row2=sql_fetch_array($result2); $k++) { if($k == 0) $options .= ''.PHP_EOL; - $options .= ''.$row2['ct_option'].' '.$row2['ct_qty'].'개'.PHP_EOL; + $price_plus = ''; + if($row2['io_price'] >= 0) + $price_plus = '+'; + $options .= ''.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개'.PHP_EOL; } if($k > 0) diff --git a/shop/ordermail2.inc.php b/shop/ordermail2.inc.php index d138bb646..03996e394 100644 --- a/shop/ordermail2.inc.php +++ b/shop/ordermail2.inc.php @@ -57,7 +57,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) $sum = sql_fetch($sql); // 옵션정보 - $sql2 = " select ct_option, ct_qty + $sql2 = " select ct_option, ct_qty, io_price from {$g5['g5_shop_cart_table']} where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1' order by io_type asc, ct_id asc "; @@ -69,7 +69,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) for($k=0; $row2=sql_fetch_array($result2); $k++) { if($k == 0) $options .= ''.PHP_EOL; - $options .= ''.$row2['ct_option'].' '.$row2['ct_qty'].'개'.PHP_EOL; + $price_plus = ''; + if($row2['io_price'] >= 0) + $price_plus = '+'; + $options .= ''.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개'.PHP_EOL; } if($k > 0) From da77649543fb34ec96da88c68ff4b9ac20f4e531 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 14:56:53 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EA=B8=88=EC=95=A1=EC=9D=B4=20-=20=EC=9D=BC=20=EB=95=8C=20?= =?UTF-8?q?=EA=B8=B0=ED=98=B8=EA=B0=80=20=EC=A4=91=EB=B3=B5=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index c090de176..efccb1f68 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1092,7 +1092,10 @@ function print_item_options($it_id, $cart_id) for($i=0; $row=sql_fetch_array($result); $i++) { if($i == 0) $str .= '
    '.PHP_EOL; - $str .= '
  • '.$row['ct_option'].' '.$row['ct_qty'].'개 (+'.display_price($row['io_price']).')
    • '.PHP_EOL; + $price_plus = ''; + if($row['io_price'] >= 0) + $price_plus = '+'; + $str .= '
  • '.$row['ct_option'].' '.$row['ct_qty'].'개 ('.$price_plus.display_price($row['io_price']).')
    • '.PHP_EOL; } if($i > 0) From 1846a9bff43b9348a265acfe8fad79a842cd2343 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 16:53:38 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=83=81=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 53f8a69d7..9a0759018 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -41,10 +41,6 @@ define('G5_DELIVERY_COMPANY', .'(KG옐로우캡택배^http://www.yellowcap.co.kr/custom/inquiry_result.asp?invoice_no=^1588-0123)' .'(KGB택배^http://www.kgbls.co.kr/sub5/trace.asp?f_slipno=^1577-4577)' ); - -define('G5_SHOP_SEARCH_SKIN', 'list.10.skin.php'); // 상품검색스킨 -define('G5_SHOP_SEARCH_MOD', 4); // 상품검색 1라인에 몇개 -define('G5_SHOP_SEARCH_ROW', 5); // 상품검색 라인수 //------------------------------------------------------------------------------ // 쇼핑몰 상수 모음 끝 //------------------------------------------------------------------------------ @@ -82,7 +78,7 @@ define('G5_OD_STATUS_FINISH' , '배송완료'); '배송완료' : 배송이 완료된 상태에서만 포인트적립이 가능합니다. '취소' : 입금확인중이나 결제완료후 취소가 가능합니다. '반품' : 배송완료 후에만 반품처리가 가능합니다. -'품절' : +'품절' : # 13.10.04 From 084275bbce25f7f604cbf8983eb69b743ecc7520 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 23 Jan 2014 22:47:47 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=97=85=EC=B2=B4=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 11 +---------- adm/shop_admin/orderlist.php | 9 +++++++-- adm/shop_admin/ordermail.inc.php | 12 ++++++------ lib/shop.lib.php | 16 ++++++++++++++++ shop/mail/ordermail.mail.php | 8 ++++---- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 737d2e762..106b78094 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -653,16 +653,7 @@ if(!isset($default['de_shop_layout_use'])) { diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index a2edc1b7a..9878a9ec0 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -384,9 +384,14 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ", - + + ]" value="" class="frm_input" size="10"> */ + ?> - + - diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php index e631fd865..2dad63e5c 100644 --- a/adm/shop_admin/ordermail.inc.php +++ b/adm/shop_admin/ordermail.inc.php @@ -22,10 +22,10 @@ if ($od_send_mail) where od_id = '{$od['od_id']}' order by ct_id "; $result = sql_query($sql); - for ($i=0; $ct=mysql_fetch_array($result); $i++) { - $cart_list[$i]['it_id'] = $ct['it_id']; - $cart_list[$i]['it_name'] = $ct['it_name']; - $cart_list[$i]['it_opt'] = $ct['ct_option']; + for ($j=0; $ct=mysql_fetch_array($result); $j++) { + $cart_list[$j]['it_id'] = $ct['it_id']; + $cart_list[$j]['it_name'] = $ct['it_name']; + $cart_list[$j]['it_opt'] = $ct['ct_option']; $ct_status = $ct['ct_status']; if ($ct_status == "준비") { @@ -34,8 +34,8 @@ if ($od_send_mail) $ct_status = "배송중"; } - $cart_list[$i]['ct_status'] = $ct_status; - $cart_list[$i]['ct_qty'] = $ct['ct_qty']; + $cart_list[$j]['ct_status'] = $ct_status; + $cart_list[$j]['ct_qty'] = $ct['ct_qty']; } diff --git a/lib/shop.lib.php b/lib/shop.lib.php index efccb1f68..187f743f9 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -2068,6 +2068,22 @@ function save_order_point($ct_status="완료") } +// 배송업체 리스트 얻기 +function get_delivery_company($company) +{ + $option = ''.PHP_EOL; + $option .= ''.PHP_EOL; + + $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY)); + for ($i=0; $i'.$value.''.PHP_EOL; + } + + return $option; +} + //============================================================================== // 쇼핑몰 라이브러리 모음 끝 //============================================================================== diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php index 142cd0e46..4781e9306 100644 --- a/shop/mail/ordermail.mail.php +++ b/shop/mail/ordermail.mail.php @@ -37,11 +37,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig - + - - - + + +