From e804ca7648bb785d091fb1ad5e6b4397ead8bccd Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 27 Mar 2013 11:45:48 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=83=81=ED=92=88=EC=A0=95=EB=B3=B4=20=ED=8F=AC=EB=A7=B7?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/cartsub.inc.php | 14 ++++++++++++++
 shop/orderform.php   | 33 +++++----------------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php
index 4bc74fa94..e16e6a76f 100644
--- a/shop/cartsub.inc.php
+++ b/shop/cartsub.inc.php
@@ -68,6 +68,9 @@ $sql = " select a.ct_id,
             and a.it_id  = b.it_id
           order by a.ct_id ";
 $result = sql_query($sql);
+
+$good_info = '';
+
 for ($i=0; $row=mysql_fetch_array($result); $i++)
 {
     if (!$goods)
@@ -79,6 +82,17 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     }
     $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_amount'].chr(31);
+    }
+
     if ($i==0) { // 계속쇼핑
         $continue_ca_id = $row['ca_id'];
     }
diff --git a/shop/orderform.php b/shop/orderform.php
index 4f32a1f79..7d0fa93e9 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -19,6 +19,10 @@ if (get_cart_count($tmp_uq_id) == 0)
 $g4['title'] = '주문서 작성';
 
 include_once('./_head.php');
+
+// 새로운 주문번호 생성
+$od_id = get_uniqid();
+set_session('ss_order_uniqid', $od_id);
 ?>
 
 <img src="<?=G4_SHOP_URL?>/img/top_orderform.gif" border="0"><p>
@@ -28,37 +32,10 @@ $s_page = 'orderform.php';
 $s_uq_id = $tmp_uq_id;
 include_once('./cartsub.inc.php');
 
-// 새로운 주문번호 생성
-$od_id = get_uniqid();
-set_session('ss_order_uniqid', $od_id);
-
 if (file_exists("./settle_{$default['de_card_pg']}.inc.php")) {
     include "./settle_{$default['de_card_pg']}.inc.php";
 }
 
-$good_info = '';
-
-// 상품수만큼 정보 필드 미리 만들어둠
-for($k=0;$itemlist = sql_fetch_array($result); $k++) {
-    // 에스크로 상품정보
-    if ($k>0)
-        $good_info .= chr(30);
-    $good_info .= "seq=".($k+1).chr(31);
-    $good_info .= "ordr_numb={$od_uq_id}_".sprintf("%04d", $k).chr(31);
-    $good_info .= "good_name=".addslashes(preg_replace("/\'|\"|\||\,|\&|\;/", "", $itemlist[$k]['it_name'])).chr(31);
-    $good_info .= "good_cntx=".$itemlist[$k]['qty'].chr(31);
-    $good_info .= "good_amtx=".$itemlist[$k]['amount'].chr(31);
-
-    // 상품명
-    if($k == 0) {
-        $goods = preg_replace("/\'|\"|\||\,|\&|\;/", "", $itemlist[$k]['it_name']);
-    }
-}
-
-if($goods_count > 1) {
-    $goods .= "외 ".($goods_count - 1);
-}
-
 $good_mny = (int)$tot_sell_amount + (int)$send_cost;
 
 $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php';
@@ -251,7 +228,7 @@ $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php';
     <input type='hidden' name='deli_term' value='03'>
 
     <!-- 장바구니 상품 개수 : 장바구니에 담겨있는 상품의 개수를 입력 -->
-    <input type='hidden' name='bask_cntx' value="<? echo (int)$goods_count; ?>" />
+    <input type='hidden' name='bask_cntx' value="<? echo (int)$goods_count + 1; ?>" />
 
     <!-- 장바구니 상품 상세 정보 (자바 스크립트 샘플(create_goodInfo()) 참고) -->
     <input type='hidden' name='good_info' value="<? echo $good_info; ?>" />