From cb8c4ae16ec0eed9f22fa9c63694b4372210270a Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 26 Sep 2014 14:43:18 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B4=EC=A1=B0=EA=B1=B4=20=ED=98=84=EA=B8=88=EC=98=81?=
 =?UTF-8?q?=EC=88=98=EC=A6=9D=20=EB=B0=9C=EA=B8=89=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php       |  4 +---
 adm/shop_admin/personalpayform.php | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 840a4c2c7..547dc5c28 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -531,8 +531,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                     </td>
                 </tr>
                 <?php
-                if ($default['de_taxsave_use'] && $amount['미수'] == 0) {
-                    if ($od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
+                if ($od['od_misu'] == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
                 ?>
                 <tr>
                     <th scope="row">현금영수증</th>
@@ -568,7 +567,6 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                     </td>
                 </tr>
                 <?php
-                    }
                 }
                 ?>
                 </tbody>
diff --git a/adm/shop_admin/personalpayform.php b/adm/shop_admin/personalpayform.php
index 574b5401a..e14fa7d01 100644
--- a/adm/shop_admin/personalpayform.php
+++ b/adm/shop_admin/personalpayform.php
@@ -174,20 +174,19 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
                 </td>
             </tr>
             <?php
-            if ($default['de_taxsave_use']) {
-                $is_cash_receipt = true;
+            $is_cash_receipt = true;
 
-                // 주문내역이 있으면 현금영수증 발급하지 않음
-                if($pp['od_id']) {
-                    $sql = " select count(od_id) as cnt from {$g5['g5_shop_order_table']} where od_id = '{$pp['od_id']}' ";
-                    $row = sql_fetch($sql);
+            // 주문내역이 있으면 현금영수증 발급하지 않음
+            if($pp['od_id']) {
+                $sql = " select count(od_id) as cnt from {$g5['g5_shop_order_table']} where od_id = '{$pp['od_id']}' ";
+                $row = sql_fetch($sql);
 
-                    if($row['cnt'] > 0)
-                        $is_cash_receipt = false;
-                }
+                if($row['cnt'] > 0)
+                    $is_cash_receipt = false;
+            }
 
-                if ($is_cash_receipt && ($pp['pp_price'] - $pp['pp_receipt_price']) == 0) {
-                    if ($pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '무통장' || $pp['pp_settle_case'] == '가상계좌' || $pp['pp_settle_case'] == '계좌이체')) {
+            if ($is_cash_receipt && ($pp['pp_price'] - $pp['pp_receipt_price']) == 0) {
+                if ($pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '무통장' || $pp['pp_settle_case'] == '가상계좌' || $pp['pp_settle_case'] == '계좌이체')) {
             ?>
             <tr>
                 <th scope="row">현금영수증</th>
@@ -223,7 +222,6 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
                 </td>
             </tr>
             <?php
-                    }
                 }
             }
             ?>