From 4f6bfe6d72bb873caf981c01b21b62af05bee4f4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 2 Jun 2014 15:25:25 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EA=B2=B0=EC=A0=9C=20kcp=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/kcp/order_approval_form.php       | 1 +
 mobile/shop/kcp/personalpay_approval_form.php | 1 +
 mobile/shop/personalpayformupdate.php         | 7 ++++---
 mobile/shop/personalpayresult.php             | 2 +-
 shop/personalpayformupdate.php                | 1 +
 shop/personalpayresult.php                    | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php
index 54a637e7d..2601b621c 100644
--- a/mobile/shop/kcp/order_approval_form.php
+++ b/mobile/shop/kcp/order_approval_form.php
@@ -277,6 +277,7 @@
 <input type="hidden" name="param_opt_1"	 value="<?php echo $param_opt_1; ?>"/>
 <input type="hidden" name="param_opt_2"	 value="<?php echo $param_opt_2; ?>"/>
 <input type="hidden" name="param_opt_3"	 value="<?php echo $param_opt_3; ?>"/>
+<input type="hidden" name="disp_tax_yn"  value="N">
 <!-- 기타 파라메터 추가 부분 - End - -->
 <!-- 화면 크기조정 부분 - Start - -->
 <input type="hidden" name="tablet_size"	 value="<?php echo $tablet_size; ?>"/>
diff --git a/mobile/shop/kcp/personalpay_approval_form.php b/mobile/shop/kcp/personalpay_approval_form.php
index dec078156..fe3143491 100644
--- a/mobile/shop/kcp/personalpay_approval_form.php
+++ b/mobile/shop/kcp/personalpay_approval_form.php
@@ -278,6 +278,7 @@
 <input type="hidden" name="param_opt_1"	 value="<?php echo $param_opt_1; ?>"/>
 <input type="hidden" name="param_opt_2"	 value="<?php echo $param_opt_2; ?>"/>
 <input type="hidden" name="param_opt_3"	 value="<?php echo $param_opt_3; ?>"/>
+<input type="hidden" name="disp_tax_yn"  value="N">
 <!-- 기타 파라메터 추가 부분 - End - -->
 <!-- 화면 크기조정 부분 - Start - -->
 <input type="hidden" name="tablet_size"	 value="<?php echo $tablet_size; ?>"/>
diff --git a/mobile/shop/personalpayformupdate.php b/mobile/shop/personalpayformupdate.php
index 3079ec9da..e6ddf5701 100644
--- a/mobile/shop/personalpayformupdate.php
+++ b/mobile/shop/personalpayformupdate.php
@@ -1,5 +1,6 @@
 <?php
 include_once('./_common.php');
+include_once(G5_LIB_PATH.'/mailer.lib.php');
 
 // 결제등록 완료 체크
 if($default['de_pg_service'] == 'kcp' && ($_POST['tran_cd'] == '' || $_POST['enc_info'] == '' || $_POST['enc_data'] == ''))
@@ -48,7 +49,7 @@ else if ($pp_settle_case == "가상계좌")
             include G5_SHOP_PATH.'/lg/xpay_result.php';
             break;
         default:
-            include G5_SHOP_PATH.'/kcp/pp_ax_hub.php';
+            include G5_MSHOP_PATH.'/kcp/pp_ax_hub.php';
             $bankname   = iconv("cp949", "utf-8", $bankname);
             $depositor  = iconv("cp949", "utf-8", $depositor);
             break;
@@ -67,7 +68,7 @@ else if ($pp_settle_case == "휴대폰")
             include G5_SHOP_PATH.'/lg/xpay_result.php';
             break;
         default:
-            include G5_SHOP_PATH.'/kcp/pp_ax_hub.php';
+            include G5_MSHOP_PATH.'/kcp/pp_ax_hub.php';
             break;
     }
 
@@ -84,7 +85,7 @@ else if ($pp_settle_case == "신용카드")
             include G5_SHOP_PATH.'/lg/xpay_result.php';
             break;
         default:
-            include G5_SHOP_PATH.'/kcp/pp_ax_hub.php';
+            include G5_MSHOP_PATH.'/kcp/pp_ax_hub.php';
             $card_name  = iconv("cp949", "utf-8", $card_name);
             break;
     }
diff --git a/mobile/shop/personalpayresult.php b/mobile/shop/personalpayresult.php
index ef31d265b..8bc8514d1 100644
--- a/mobile/shop/personalpayresult.php
+++ b/mobile/shop/personalpayresult.php
@@ -201,7 +201,7 @@ if($od['od_pg'] == 'lg') {
         </ul>
     </section>
 
-    <?php if ($pp['pp_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin && $pp['pp_pg'] == 'kcp') {
+    <?php if ($pp['pp_settle_case'] == '가상계좌' && $pp['pp_receipt_price'] == 0 && $default['de_card_test'] && $is_admin && $pp['pp_pg'] == 'kcp') {
     preg_match("/\s{1}([^\s]+)\s?/", $pp['pp_bank_account'], $matchs);
     $deposit_no = trim($matchs[1]);
     ?>
diff --git a/shop/personalpayformupdate.php b/shop/personalpayformupdate.php
index 227862849..56e4f8122 100644
--- a/shop/personalpayformupdate.php
+++ b/shop/personalpayformupdate.php
@@ -1,5 +1,6 @@
 <?php
 include_once('./_common.php');
+include_once(G5_LIB_PATH.'/mailer.lib.php');
 
 if($default['de_pg_service'] == 'lg' && !$_POST['LGD_PAYKEY'])
     alert('결제등록 요청 후 주문해 주십시오.');
diff --git a/shop/personalpayresult.php b/shop/personalpayresult.php
index cc082b0df..9cd6f057a 100644
--- a/shop/personalpayresult.php
+++ b/shop/personalpayresult.php
@@ -207,7 +207,7 @@ if($od['od_pg'] == 'lg') {
         </ul>
     </section>
 
-    <?php if ($pp['pp_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin && $pp['pp_pg'] == 'kcp') {
+    <?php if ($pp['pp_settle_case'] == '가상계좌'  && $pp['pp_receipt_price'] == 0 && $default['de_card_test'] && $is_admin && $pp['pp_pg'] == 'kcp') {
     preg_match("/\s{1}([^\s]+)\s?/", $pp['pp_bank_account'], $matchs);
     $deposit_no = trim($matchs[1]);
     ?>