From ba9af2dd4078546c7050d73770d17ce12b10f00f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 11 Aug 2014 14:03:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EA=B3=BC=20=EC=97=B0?=
 =?UTF-8?q?=EA=B3=84=EB=90=9C=20=EA=B0=9C=EC=9D=B8=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=EB=8A=94=20=ED=98=84=EA=B8=88=EC=98=81=EC=88=98=EC=A6=9D=20?=
 =?UTF-8?q?=EB=B0=9C=EA=B8=89=EB=90=98=EC=A7=80=20=EC=95=8A=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       |  2 +-
 adm/shop_admin/personalpayform.php | 17 +++++++++++++++--
 mobile/shop/personalpayresult.php  | 13 ++++++++++++-
 shop/personalpayresult.php         | 13 ++++++++++++-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index c453a55bd..690de0582 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -528,7 +528,7 @@ if($od['od_pg'] == 'lg') {
                     </td>
                 </tr>
                 <?php
-                if ($amount['미수'] == 0) {
+                if ($default['de_taxsave_use'] && $amount['미수'] == 0) {
                     if ($od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
                 ?>
                 <tr>
diff --git a/adm/shop_admin/personalpayform.php b/adm/shop_admin/personalpayform.php
index 3af42f7b8..574b5401a 100644
--- a/adm/shop_admin/personalpayform.php
+++ b/adm/shop_admin/personalpayform.php
@@ -174,8 +174,20 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
                 </td>
             </tr>
             <?php
-            if (($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 ($default['de_taxsave_use']) {
+                $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($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'] == '계좌이체')) {
             ?>
             <tr>
                 <th scope="row">현금영수증</th>
@@ -211,6 +223,7 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
                 </td>
             </tr>
             <?php
+                    }
                 }
             }
             ?>
diff --git a/mobile/shop/personalpayresult.php b/mobile/shop/personalpayresult.php
index 8a3c8e065..e9927dc67 100644
--- a/mobile/shop/personalpayresult.php
+++ b/mobile/shop/personalpayresult.php
@@ -174,8 +174,19 @@ if($pp['pp_pg'] == 'lg') {
 
                 // 현금영수증 발급을 사용하는 경우에만
                 if ($default['de_taxsave_use']) {
+                    $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($row['cnt'] > 0)
+                            $is_cash_receipt = false;
+                    }
+
                     // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
-                    if ($misu_price == 0 && $pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '계좌이체' || $pp['pp_settle_case'] == '가상계좌')) {
+                    if ($is_cash_receipt && $misu_price == 0 && $pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '계좌이체' || $pp['pp_settle_case'] == '가상계좌')) {
                 ?>
                 <tr>
                     <th scope="row">현금영수증</th>
diff --git a/shop/personalpayresult.php b/shop/personalpayresult.php
index 0b0098af1..aa76a7749 100644
--- a/shop/personalpayresult.php
+++ b/shop/personalpayresult.php
@@ -180,8 +180,19 @@ if($pp['pp_pg'] == 'lg') {
 
                 // 현금영수증 발급을 사용하는 경우에만
                 if ($default['de_taxsave_use']) {
+                    $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($row['cnt'] > 0)
+                            $is_cash_receipt = false;
+                    }
+
                     // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
-                    if ($misu_price == 0 && $pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '계좌이체' || $pp['pp_settle_case'] == '가상계좌')) {
+                    if ($is_cash_receipt && $misu_price == 0 && $pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '계좌이체' || $pp['pp_settle_case'] == '가상계좌')) {
                 ?>
                 <tr>
                     <th scope="row">현금영수증</th>