From 6cb675483e2ed4e23e29a4c32da39525c135ab39 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Fri, 2 Oct 2015 10:02:57 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A7=80=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=ED=85=8C=EB=A7=88=EC=97=90=EC=84=9C=20=EC=A7=80=EC=A0=95?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderaddress.php | 12 ++++++++++--
 shop/orderaddress.php        | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php
index c4297c767..0c43ad079 100644
--- a/mobile/shop/orderaddress.php
+++ b/mobile/shop/orderaddress.php
@@ -1,10 +1,18 @@
 <?php
 include_once('./_common.php');
 
+// 테마에 orderaddress.php 있으면 include
+if(defined('G5_THEME_MSHOP_PATH')) {
+    $theme_orderaddress_file = G5_THEME_MSHOP_PATH.'/orderaddress.php';
+    if(is_file($theme_orderaddress_file)) {
+        include_once($theme_orderaddress_file);
+        return;
+        unset($theme_orderaddress_file);
+    }
+}
+
 $g5['title'] = '배송지 목록';
 include_once(G5_PATH.'/head.sub.php');
-
-$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
 ?>
 
 <form name="forderaddress" method="post" action="<?php echo $order_action_url; ?>" autocomplete="off">
diff --git a/shop/orderaddress.php b/shop/orderaddress.php
index 8abcb5039..32aa4d681 100644
--- a/shop/orderaddress.php
+++ b/shop/orderaddress.php
@@ -31,16 +31,25 @@ $result = sql_query($sql);
 if(!mysql_num_rows($result))
     alert_close('배송지 목록 자료가 없습니다.');
 
+$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
+
 if (G5_IS_MOBILE) {
     include_once(G5_MSHOP_PATH.'/orderaddress.php');
     return;
 }
 
+// 테마에 orderaddress.php 있으면 include
+if(defined('G5_THEME_SHOP_PATH')) {
+    $theme_orderaddress_file = G5_THEME_SHOP_PATH.'/orderaddress.php';
+    if(is_file($theme_orderaddress_file)) {
+        include_once($theme_orderaddress_file);
+        return;
+        unset($theme_orderaddress_file);
+    }
+}
+
 $g5['title'] = '배송지 목록';
 include_once(G5_PATH.'/head.sub.php');
-
-$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
-
 ?>
 <form name="forderaddress" method="post" action="<?php echo $order_action_url; ?>" autocomplete="off">
 <div id="sod_addr" class="new_win">