From d7438cdbe9e8ad479ffc448b6a67ec4d50e52340 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Tue, 15 Sep 2015 09:41:28 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B0=84?=
 =?UTF-8?q?=ED=8E=B8=EA=B2=B0=EC=A0=9C=20=ED=91=9C=EC=8B=9C=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

---
 adm/shop_admin/orderform.php | 36 ++++++++++++++++++++++++++++++++++++
 adm/shop_admin/orderlist.php | 18 ++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 429e6544f..c043395e8 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -297,6 +297,23 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
     // 결제방법
     $s_receipt_way = $od['od_settle_case'];
 
+    if($od['od_settle_case'] == '간편결제') {
+        switch($od['od_pg']) {
+            case 'lg':
+                $s_receipt_way = 'PAYNOW';
+                break;
+            case 'inicis':
+                $s_receipt_way = 'KPAY';
+                break;
+            case 'kcp':
+                $s_receipt_way = 'PAYCO';
+                break;
+            default:
+                $s_receipt_way = $row['od_settle_case'];
+                break;
+        }
+    }
+
     if ($od['od_receipt_point'] > 0)
         $s_receipt_way .= "+포인트";
     ?>
@@ -427,6 +444,25 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                 </tr>
                 <?php } ?>
 
+                <?php if ($od['od_settle_case'] == '간편결제') { ?>
+                <tr>
+                    <th scope="row" class="sodr_sppay"><?php echo $s_receipt_way; ?> 결제금액</th>
+                    <td>
+                        <?php if ($od['od_receipt_time'] == "0000-00-00 00:00:00") {?>0원
+                        <?php } else { ?><?php echo display_price($od['od_receipt_price']); ?>
+                        <?php } ?>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row" class="sodr_sppay"><?php echo $s_receipt_way; ?> 승인일시</th>
+                    <td>
+                        <?php if ($od['od_receipt_time'] == "0000-00-00 00:00:00") { echo $s_receipt_way; ?> 결제 일시 정보가 없습니다.
+                        <?php } else { ?><?php echo substr($od['od_receipt_time'], 0, 20); ?>
+                        <?php } ?>
+                    </td>
+                </tr>
+                <?php } ?>
+
                 <?php if ($od['od_settle_case'] != '무통장') { ?>
                 <tr>
                     <th scope="row">결제대행사 링크</th>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 61ee11354..803025be2 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -278,6 +278,24 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         {
             $s_receipt_way = $row['od_settle_case'];
             $s_br = '<br />';
+
+            // 간편결제
+            if($row['od_settle_case'] == '간편결제') {
+                switch($row['od_pg']) {
+                    case 'lg':
+                        $s_receipt_way = 'PAYNOW';
+                        break;
+                    case 'inicis':
+                        $s_receipt_way = 'KPAY';
+                        break;
+                    case 'kcp':
+                        $s_receipt_way = 'PAYCO';
+                        break;
+                    default:
+                        $s_receipt_way = $row['od_settle_case'];
+                        break;
+                }
+            }
         }
         else
         {