diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index f0043a721..48e5a171f 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -530,18 +530,18 @@ include_once(G4_MSHOP_PATH.'/_head.php');
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
+            if ($od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>
 
         <div id="sod_fin_cancelfrm">
-            <form method="post" action="<?php echo G4_SHOP_URL; ?>/orderinquirycancel.php">
+            <form method="post" action="<?php echo G4_SHOP_URL; ?>/orderinquirycancel.php" onsubmit="return fcancel_check(this);">
             <input type="hidden" name="od_id"  value="<?php echo $od['od_id']; ?>">
             <input type="hidden" name="uq_id" value="<?php echo $od['uq_id']; ?>">
             <input type="hidden" name="token"  value="<?php echo $token; ?>">
 
             <label for="cancel_memo">취소사유</label>
-            <input type="text" name="cancel_memo" id="cancel_memo" required class="frm_input" size="40" maxlength="100">
+            <input type="text" name="cancel_memo" id="cancel_memo" required class="frm_input required" size="40" maxlength="100">
             <input type="submit" value="확인" class="btn_frmline">
 
             </form>
@@ -574,6 +574,22 @@ include_once(G4_MSHOP_PATH.'/_head.php');
 
 </div>
 
+<script>
+function fcancel_check(f)
+{
+    if(!confirm("주문을 정말 취소하시겠습니까?"))
+        return false;
+
+    var memo = f.cancel_memo.value;
+    if(memo == "") {
+        alert("취소사유를 입력해 주십시오.");
+        return false;
+    }
+
+    return true;
+}
+</script>
+
 <?php
 include_once(G4_MSHOP_PATH.'/_tail.php');
 ?>
\ No newline at end of file
diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index 6d141bd7c..b61e99d60 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -15,10 +15,45 @@ if (!$od['od_id']) {
     alert("존재하는 주문이 아닙니다.");
 }
 
-if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
-    ;
-} else {
+// 주문상품의 상태가 주문인지 체크
+$sql = " select SUM(IF(ct_status = '주문', 1, 0)) as od_count2,
+                COUNT(*) as od_count1
+            from {$g4['shop_cart_table']}
+            where uq_id = '$uq_id' ";
+$ct = sql_fetch($sql);
+
+if($ct['od_count1'] != $ct['od_count2'] || ($od['od_settle_case'] == '가상계좌' && $od['od_receipt_amount'] > 0))
     alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
+
+// PG 결제 취소
+if($od['od_tno']) {
+    if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
+        include './settle_'.$default['de_card_pg'].'.inc.php';
+    }
+    $_POST['tno'] = $od['od_tno'];
+    $_POST['req_tx'] = 'mod';
+    $_POST['mod_type'] = 'STSC';
+    if($od['od_escrow']) {
+        $_POST['req_tx'] = 'mod_escrow';
+        $_POST['mod_type'] = 'STE2';
+        if($od['od_settle_case'] == '가상계좌')
+            $_POST['mod_type'] = 'STE5';
+    }
+    $_POST['mod_desc'] = iconv("utf-8", "euc-kr", '주문자 본인 취소-'.$cancel_memo);
+    $_POST['site_cd'] = $default['de_kcp_mid'];
+
+    // 취소내역 한글깨짐방지
+    $def_locale = setlocale(LC_CTYPE, 0);
+    $locale_change = false;
+    if(preg_match("/utf[\-]?8/i", $def_locale)) {
+        setlocale(LC_CTYPE, 'ko_KR.euc-kr');
+        $locale_change = true;
+    }
+
+    include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
+
+    if($locale_change)
+        setlocale(LC_CTYPE, $def_locale);
 }
 
 // 장바구니 자료 취소
@@ -27,7 +62,7 @@ sql_query(" update {$g4['shop_cart_table']} set ct_status = '취소' where uq_id
 // 주문 취소
 $cancel_memo = addslashes($cancel_memo);
 //sql_query(" update $g4[shop_order_table] set od_temp_point = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - {$g4['time_ymdhis']} (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' ");
-sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' ");
+sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_amount = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' ");
 
 // 주문취소 회원의 포인트를 되돌려 줌
 if ($od['od_receipt_point'] > 0) {
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index bf59646c4..e82bce128 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -57,6 +57,8 @@ if(openwin != null) {
             <dd>상품 배송이 완료되었습니다.</dd>
         </dl>
         <?php
+        $od_count1 = $od_count2 = 0;
+
         $sql = " select it_id, it_name, cp_amount
                     from {$g4['shop_cart_table']}
                     where uq_id = '$uq_id'
@@ -119,6 +121,11 @@ if(openwin != null) {
                         $tot_point       += $point;
                         $tot_sell_amount += $sell_amount;
                     }
+
+                    // 전체 상품의 상태가 주문인지 비교할 때 사용
+                    $od_count1++;
+                    if($opt['ct_status'] == '주문')
+                        $od_count2++;
                 }
                 ?>
                 </tbody>
@@ -541,18 +548,18 @@ if(openwin != null) {
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
+            if ($od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>
 
         <div id="sod_fin_cancelfrm">
-            <form method="post" action="./orderinquirycancel.php">
+            <form method="post" action="./orderinquirycancel.php" onsubmit="return fcancel_check(this);">
             <input type="hidden" name="od_id"  value="<?php echo $od['od_id']; ?>">
             <input type="hidden" name="uq_id" value="<?php echo $od['uq_id']; ?>">
             <input type="hidden" name="token"  value="<?php echo $token; ?>">
 
             <label for="cancel_memo">취소사유</label>
-            <input type="text" name="cancel_memo" id="cancel_memo" required class="frm_input" size="40" maxlength="100">
+            <input type="text" name="cancel_memo" id="cancel_memo" required class="frm_input required" size="40" maxlength="100">
             <input type="submit" value="확인" class="btn_frmline">
 
             </form>
@@ -586,6 +593,22 @@ if(openwin != null) {
 </div>
 <!-- } 주문상세내역 끝 -->
 
+<script>
+function fcancel_check(f)
+{
+    if(!confirm("주문을 정말 취소하시겠습니까?"))
+        return false;
+
+    var memo = f.cancel_memo.value;
+    if(memo == "") {
+        alert("취소사유를 입력해 주십시오.");
+        return false;
+    }
+
+    return true;
+}
+</script>
+
 <?php
 include_once('./_tail.php');
 ?>
\ No newline at end of file