From 4560df2cd1df75559f8b4ea9096a55075493ddf8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 13:26:30 +0900 Subject: [PATCH 1/7] =?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=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/cartsub.inc.php | 334 --------------------------- shop/cartsub.inc.php | 440 ------------------------------------ 2 files changed, 774 deletions(-) delete mode 100644 mobile/shop/cartsub.inc.php delete mode 100644 shop/cartsub.inc.php diff --git a/mobile/shop/cartsub.inc.php b/mobile/shop/cartsub.inc.php deleted file mode 100644 index a97a47b0f..000000000 --- a/mobile/shop/cartsub.inc.php +++ /dev/null @@ -1,334 +0,0 @@ - - - - -
- - - - - - - - - -'; -} else if($s_page == 'orderinquiryview.php') { - echo ''; -} -?> - - - - '$ctime' "; -} -$sql .= " order by a.ct_id "; -$result = sql_query($sql); - -$good_info = ''; - -for ($i=0; $row=mysql_fetch_array($result); $i++) -{ - // 합계금액 계산 - $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price, - SUM(ct_point * ct_qty) as point, - SUM(ct_qty) as qty - from {$g4['shop_cart_table']} - where it_id = '{$row['it_id']}' - and uq_id = '$s_uq_id' "; - $sum = sql_fetch($sql); - - if (!$goods) - { - //$goods = addslashes($row[it_name]); - //$goods = get_text($row[it_name]); - $goods = preg_replace("/\'|\"|\||\,|\&|\;/", "", $row['it_name']); - $goods_it_id = $row['it_id']; - } - $goods_count++; - - // 에스크로 상품정보 - if($s_page == 'orderform.php' && $default['de_escrow_use']) { - if ($i>0) - $good_info .= chr(30); - $good_info .= "seq=".($i+1).chr(31); - $good_info .= "ordr_numb={$od_id}_".sprintf("%04d", $i).chr(31); - $good_info .= "good_name=".addslashes($row['it_name']).chr(31); - $good_info .= "good_cntx=".$row['ct_qty'].chr(31); - $good_info .= "good_amtx=".$row['ct_price'].chr(31); - } - - if ($i==0) { // 계속쇼핑 - $continue_ca_id = $row['ca_id']; - } - - if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php') { // 링크를 붙이고 - $a1 = ''; - $a2 = ''; - $image = get_it_image($row['it_id'], 70, 70); - } else { // 붙이지 않고 - $a1 = ''; - $a2 = ''; - $image = get_it_image($row['it_id'], 50, 50); - } - - $it_name = $a1 . stripslashes($row['it_name']) . $a2; - $it_options = print_item_options($row['it_id'], $s_uq_id); - if($it_options) { - $mod_options = ''; - if($s_page == 'cart.php') - $mod_options = '
'; - $it_name .= '
'.$it_options.'
'; - } - - $point = $sum['point']; - $sell_amount = $sum['price']; -?> - - - - - - - - - - - '; - else if ($s_page == 'orderinquiryview.php') - echo ''; - ?> - - -'; -} else { - // 배송비가 넘어왔다면 - if ($_POST['od_send_cost']) { - $send_cost = (int)$_POST['od_send_cost']; - } else { - // 배송비 계산 - if ($default['de_send_cost_case'] == '없음') - $send_cost = 0; - else { - // 배송비 상한 : 여러단계의 배송비 적용 가능 - $send_cost_limit = explode(";", $default['de_send_cost_limit']); - $send_cost_list = explode(";", $default['de_send_cost_list']); - $send_cost = 0; - for ($k=0; $k 0) - $send_cost = $row['od_send_cost']; - } -} -?> - -
상품이미지상품명총수량판매가소계포인트상태
- - - - '.$row['ct_status'].'
장바구니에 담긴 상품이 없습니다.
- - - - 0) -{ -?> - -
- 배송비 - -
- - - - 0) { -?> - -
- 총계 - -
- - - - -
- - 쇼핑 계속하기 - - - - -

장바구니의 상품을 주문하시려면 주문하기를 클릭하세요. 비우기는 장바구니의 상품을 모두 비웁니다.

- 쇼핑 계속하기 - 주문하기 - 선택삭제 - 비우기 - -
- - -
- - - - diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php deleted file mode 100644 index 3a738160d..000000000 --- a/shop/cartsub.inc.php +++ /dev/null @@ -1,440 +0,0 @@ - - - - -
- - - - - - - - - - - - -'; -else if ($s_page == 'orderinquiryview.php') - echo ''; -?> - - - - '$ctime' "; -} -$sql .= " order by a.ct_id "; -$result = sql_query($sql); - -$good_info = ''; - -for ($i=0; $row=mysql_fetch_array($result); $i++) -{ - // 합계금액 계산 - $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price, - SUM(ct_point * ct_qty) as point, - SUM(ct_qty) as qty - from {$g4['shop_cart_table']} - where it_id = '{$row['it_id']}' - and uq_id = '$s_uq_id' "; - $sum = sql_fetch($sql); - - if (!$goods) - { - //$goods = addslashes($row[it_name]); - //$goods = get_text($row[it_name]); - $goods = preg_replace("/\'|\"|\||\,|\&|\;/", "", $row['it_name']); - $goods_it_id = $row['it_id']; - } - $goods_count++; - - // 에스크로 상품정보 - if($s_page == 'orderform.php' && $default['de_escrow_use']) { - if ($i>0) - $good_info .= chr(30); - $good_info .= "seq=".($i+1).chr(31); - $good_info .= "ordr_numb={$od_id}_".sprintf("%04d", $i).chr(31); - $good_info .= "good_name=".addslashes($row['it_name']).chr(31); - $good_info .= "good_cntx=".$row['ct_qty'].chr(31); - $good_info .= "good_amtx=".$row['ct_price'].chr(31); - } - - if ($i==0) { // 계속쇼핑 - $continue_ca_id = $row['ca_id']; - } - - if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php') { // 링크를 붙이고 - $a1 = ''; - $a2 = ''; - $image = get_it_image($row['it_id'], 70, 70); - } else { // 붙이지 않고 - $a1 = ''; - $a2 = ''; - $image = get_it_image($row['it_id'], 50, 50); - } - - $it_name = $a1 . stripslashes($row['it_name']) . $a2; - $it_options = print_item_options($row['it_id'], $s_uq_id); - if($it_options) { - $mod_options = ''; - if($s_page == 'cart.php') - $mod_options = '
'; - $it_name .= '
'.$it_options.'
'; - } - - $point = $sum['point']; - $sell_amount = $sum['price']; - - // 쿠폰 - if($s_page == 'orderform.php' && $is_member) { - $cp_button = ''; - - $sql = " select count(*) as cnt - from {$g4['shop_coupon_table']} - where mb_id = '{$member['mb_id']}' - and cp_used = '0' - and cp_start <= '".G4_TIME_YMD."' - and cp_end >= '".G4_TIME_YMD."' - and ( - ( cp_method = '0' and cp_target = '{$row['it_id']}' ) - OR - ( cp_method = '1' and ( cp_target IN ( '{$row['ca_id']}', '{$row['ca_id2']}', '{$row['ca_id3']}' ) ) ) - ) "; - $cp = sql_fetch($sql); - - if($cp['cnt']) - $cp_button = ''; - } -?> - - - - - - - - - - - - - '; - else if ($s_page == 'orderinquiryview.php') - echo ''; - ?> - - -'; -} else { - // 배송비가 넘어왔다면 - if ($_POST['od_send_cost']) { - $send_cost = (int)$_POST['od_send_cost']; - } else { - // 배송비 계산 - if ($default['de_send_cost_case'] == '없음') - $send_cost = 0; - else { - // 배송비 상한 : 여러단계의 배송비 적용 가능 - $send_cost_limit = explode(";", $default['de_send_cost_limit']); - $send_cost_list = explode(";", $default['de_send_cost_list']); - $send_cost = 0; - for ($k=0; $k 0) - $send_cost = $row['od_send_cost']; - } -} -?> - -
상품이미지상품명총수량판매가쿠폰소계포인트상태
- - - - - - '.$row['ct_status'].'
장바구니에 담긴 상품이 없습니다.
- - - - 0) -{ -?> - -
- 배송비 - -
- - - - 0) { -?> - -
- 총계 - -
- - - - -
- - 쇼핑 계속하기 - - - - -

장바구니의 상품을 주문하시려면 주문하기를 클릭하세요. 비우기는 장바구니의 상품을 모두 비웁니다.

- 쇼핑 계속하기 - 주문하기 - 선택삭제 - 비우기 - -
- - -
- - - - - - From 726b75694e3276a57eaeb7e711b434308567e45e Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 13:36:19 +0900 Subject: [PATCH 2/7] =?UTF-8?q?footer=EC=9D=98=20=EB=AA=A8=EB=B0=94?= =?UTF-8?q?=EC=9D=BC=20=EB=B2=84=EC=A0=84=EA=B0=80=EA=B8=B0=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/shop.tail.php | 7 ------- shop/shop.tail.php | 7 ------- 2 files changed, 14 deletions(-) diff --git a/mobile/shop/shop.tail.php b/mobile/shop/shop.tail.php index 23e040e08..ae1fb013a 100644 --- a/mobile/shop/shop.tail.php +++ b/mobile/shop/shop.tail.php @@ -26,13 +26,6 @@ $admin = get_admin("super"); 상단으로 - -모바일 버전으로 보기 - - - -모바일 버전으로 보기 - - Date: Tue, 25 Jun 2013 14:36:47 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=83=81=ED=92=88=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=EC=97=90=20=EB=B9=A0=EC=A7=84=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/shop.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/shop.sql b/install/shop.sql index 0dec38623..be6ac969c 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -434,6 +434,8 @@ CREATE TABLE IF NOT EXISTS `shop_item` ( `it_ip` varchar(25) NOT NULL DEFAULT '', `it_order` int(11) NOT NULL DEFAULT '0', `it_tel_inq` tinyint(4) NOT NULL DEFAULT '0', + `it_info_gubun` varchar(5) NOT NULL DEFAULT '', + `it_info_value` text NOT NULL, `it_img1` varchar(255) NOT NULL DEFAULT '', `it_img2` varchar(255) NOT NULL DEFAULT '', `it_img3` varchar(255) NOT NULL DEFAULT '', From 6f03f01709d4a853ff9438706031f413cd2819f7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 14:37:10 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=98=B5=EC=85=98=20=EB=AA=A8=EB=91=90=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=EC=8B=9C=20=EC=9E=A5=EB=B0=94=EA=B5=AC?= =?UTF-8?q?=EB=8B=88=EC=97=90=EC=84=9C=20=EC=82=AD=EC=A0=9C=EB=90=98?= =?UTF-8?q?=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/cartupdate.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/shop/cartupdate.php b/shop/cartupdate.php index 85f1d5297..64b23c894 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -145,10 +145,10 @@ else if ($act == "optionmod") // 장바구니에서 옵션변경 $option_count = count($_POST['io_id']); - if($option_count) { - if($_POST['io_type'][0] != 0) - alert('상품의 선택옵션을 선택해 주십시오.'); + if($_POST['io_type'][0] != 0) + alert('상품의 선택옵션을 선택해 주십시오.'); + if($option_count) { for($i=0; $i Date: Tue, 25 Jun 2013 14:42:29 +0900 Subject: [PATCH 5/7] =?UTF-8?q?option=20=ED=83=9C=EA=B7=B8=20=EB=8B=AB?= =?UTF-8?q?=ED=9E=88=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EA=B2=83=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 --- adm/shop_admin/configform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 6f297e020..6e2731322 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -423,7 +423,7 @@ $pg_anchor = '
    From 5c3576d818caf8ecc90a2bb3b4fcc68011ea3246 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 15:09:21 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=EC=97=90=EC=84=9C=20=EB=B9=A0?= =?UTF-8?q?=EC=A7=84=20=ED=95=84=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 --- install/shop.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/shop.sql b/install/shop.sql index be6ac969c..b84aaf82e 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -527,6 +527,7 @@ DROP TABLE IF EXISTS `shop_item_relation`; CREATE TABLE IF NOT EXISTS `shop_item_relation` ( `it_id` varchar(20) NOT NULL DEFAULT '', `it_id2` varchar(10) NOT NULL DEFAULT '', + `ir_no` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`it_id`,`it_id2`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From 7dd6c67f5f423f97f880ca740889e1b7dae94f46 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 15:50:48 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EA=B8=B8=EC=9D=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/shop.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/shop.sql b/install/shop.sql index b84aaf82e..b3e49d8d0 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -434,7 +434,7 @@ CREATE TABLE IF NOT EXISTS `shop_item` ( `it_ip` varchar(25) NOT NULL DEFAULT '', `it_order` int(11) NOT NULL DEFAULT '0', `it_tel_inq` tinyint(4) NOT NULL DEFAULT '0', - `it_info_gubun` varchar(5) NOT NULL DEFAULT '', + `it_info_gubun` varchar(50) NOT NULL DEFAULT '', `it_info_value` text NOT NULL, `it_img1` varchar(255) NOT NULL DEFAULT '', `it_img2` varchar(255) NOT NULL DEFAULT '', @@ -526,7 +526,7 @@ CREATE TABLE IF NOT EXISTS `shop_item_qa` ( DROP TABLE IF EXISTS `shop_item_relation`; CREATE TABLE IF NOT EXISTS `shop_item_relation` ( `it_id` varchar(20) NOT NULL DEFAULT '', - `it_id2` varchar(10) NOT NULL DEFAULT '', + `it_id2` varchar(20) NOT NULL DEFAULT '', `ir_no` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`it_id`,`it_id2`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8;