From c79b803dd1200153b0dcc618d1613f70a3fde072 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 15 Jan 2018 19:56:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=8B=88=EC=8B=9C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=82=BC=EC=84=B1=ED=8E=98=EC=9D=B4=20=ED=8F=AC=EC=9D=B8?=
 =?UTF-8?q?=ED=8A=B8=EC=99=80=20=EA=B2=B0=EC=A0=9C=EC=8B=9C=20=EC=98=A4?=
 =?UTF-8?q?=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/samsungpay/order.script.php | 7 ++++++-
 mobile/shop/settle_inicis.inc.php       | 2 ++
 shop/inicis/inipay_cancel.php           | 4 ++++
 shop/settle_inicis.inc.php              | 4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mobile/shop/samsungpay/order.script.php b/mobile/shop/samsungpay/order.script.php
index c6796d326..9a433b4a6 100644
--- a/mobile/shop/samsungpay/order.script.php
+++ b/mobile/shop/samsungpay/order.script.php
@@ -37,7 +37,12 @@ function samsungpay_form_submit(){
                 samsungpayform.P_RESERVED.value = samsungpayform.P_RESERVED.value.replace("&useescrow=Y", "")+"&d_samsungpay=Y";
             }
 
-            samsungpayform.P_AMT.value = samsungpayform.good_mny.value;
+            if( ! jQuery("form[name='sm_form']").length ){
+                alert("해당 폼이 존재 하지 않는 결제오류입니다.");
+                return false;
+            }
+
+            samsungpayform.P_AMT.value = samsungpayform.good_mny.value = document.sm_form.good_mny.value; 
             samsungpayform.P_UNAME.value = pf.od_name.value;
             samsungpayform.P_MOBILE.value = pf.od_hp.value;
             samsungpayform.P_EMAIL.value = pf.od_email.value;
diff --git a/mobile/shop/settle_inicis.inc.php b/mobile/shop/settle_inicis.inc.php
index 2449bf437..6cfbb3839 100644
--- a/mobile/shop/settle_inicis.inc.php
+++ b/mobile/shop/settle_inicis.inc.php
@@ -1,6 +1,8 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
+define('G5_MOBILE_INICIS_SETTLE', true);
+
 // curl 체크
 if (!function_exists('curl_init')) {
     alert('cURL 모듈이 설치되어 있지 않습니다.\\n상점관리자에게 문의해 주십시오.');
diff --git a/shop/inicis/inipay_cancel.php b/shop/inicis/inipay_cancel.php
index 14315e98b..b96f06f04 100644
--- a/shop/inicis/inipay_cancel.php
+++ b/shop/inicis/inipay_cancel.php
@@ -20,6 +20,10 @@
 
     $TID = $tno;
     $inipay->SetField("type", "cancel"); // 고정
+    if( $default['de_inicis_admin_key'] ){
+        $inipay->SetField("mid", $mid);
+        $inipay->SetField("admin", $default['de_inicis_admin_key']);
+    }
     $inipay->SetField("tid", $TID); // 고정
     $inipay->SetField("cancelmsg", "DB FAIL"); // 취소사유
     $inipay->startAction();
diff --git a/shop/settle_inicis.inc.php b/shop/settle_inicis.inc.php
index f5e4caacc..6311ab9be 100644
--- a/shop/settle_inicis.inc.php
+++ b/shop/settle_inicis.inc.php
@@ -18,7 +18,9 @@
     $stdpay_js_url = 'https://stdpay.inicis.com/stdjs/INIStdPay.js';
 }
 else {
-    $default['de_inicis_mid'] = "SIR".$default['de_inicis_mid'];
+    if( !defined('G5_MOBILE_INICIS_SETTLE') ){
+        $default['de_inicis_mid'] = "SIR".$default['de_inicis_mid'];
+    }
 
     if ($default['de_escrow_use'] == 1) {
         // 에스크로결제