diff --git a/adm/admin.menu500.shop_2of2.php b/adm/admin.menu500.shop_2of2.php
index 0bd0bd840..370d6006b 100644
--- a/adm/admin.menu500.shop_2of2.php
+++ b/adm/admin.menu500.shop_2of2.php
@@ -3,6 +3,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu['menu500'] = array (
+<<<<<<< HEAD
+ array('500000', '쇼핑몰현황/기타', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
+ array('500100', '상품판매순위', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
+ array('500110', '매출현황', G4_SHOP_ADMIN_URL.'/sale1.php'),
+ array('500120', '주문내역출력', G4_SHOP_ADMIN_URL.'/orderprint.php'),
+ array('500130', '전자결제내역', G4_SHOP_ADMIN_URL.'/ordercardhistory.php'),
+ array('500140', '보관함현황', G4_SHOP_ADMIN_URL.'/wishlist.php'),
+
+ array('500200', 'SMS 문자전송', G4_SHOP_ADMIN_URL.'/smssend.php'),
+ array('500210', '가격비교사이트', G4_SHOP_ADMIN_URL.'/price.php')
+=======
array('500000', '쇼핑몰현황/기타', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
array('500100', '상품판매순위', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
array('500110', '매출현황', G4_SHOP_ADMIN_URL.'/sale1.php'),
@@ -12,5 +23,6 @@ $menu['menu500'] = array (
array('500200', 'SMS 문자전송', G4_SHOP_ADMIN_URL.'/smssend.php'),
array('500210', '가격비교사이트', G4_SHOP_ADMIN_URL.'/price.php')
+>>>>>>> e82fa69b4c2eeb9e9eb9eefa11b485ed5a6846c6
);
?>
\ No newline at end of file
diff --git a/adm/shop_admin/bannerform.php b/adm/shop_admin/bannerform.php
index 259b21c4f..838404ac4 100644
--- a/adm/shop_admin/bannerform.php
+++ b/adm/shop_admin/bannerform.php
@@ -20,7 +20,7 @@ else
}
$g4[title] = $html_title;
-include_once ("$g4[admin_path]/admin.head.php");
+include_once(G4_ADMIN_PATH."/admin.head.php");
?>
=subtitle($html_title)?>
@@ -137,5 +137,5 @@ if (document.fbanner.w.value == 'u')
-include_once ("$g4[admin_path]/admin.tail.php");
+include_once(G4_ADMIN_PATH."/admin.tail.php");
?>
diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php
index 29335a2ca..e5310c7ce 100644
--- a/adm/shop_admin/bannerlist.php
+++ b/adm/shop_admin/bannerlist.php
@@ -5,7 +5,7 @@ include_once("./_common.php");
auth_check($auth[$sub_menu], "r");
$g4[title] = "배너관리";
-include_once ("$g4[admin_path]/admin.head.php");
+include_once(G4_ADMIN_PATH."/admin.head.php");
$sql_common = " from $g4[yc4_banner_table] ";
@@ -101,5 +101,5 @@ if ($i == 0) {
-include_once ("$g4[admin_path]/admin.tail.php");
+include_once(G4_ADMIN_PATH."/admin.tail.php");
?>
diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php
index 675f43df7..c7bccc4c8 100644
--- a/adm/shop_admin/categoryform.php
+++ b/adm/shop_admin/categoryform.php
@@ -77,7 +77,7 @@ else if ($w == "u")
$qstr = "page=$page&sort1=$sort1&sort2=$sort2";
$g4[title] = $html_title;
-include_once ("$g4[admin_path]/admin.head.php");
+include_once(G4_ADMIN_PATH."/admin.head.php");
?>
=smarteditor_load();?>
@@ -348,5 +348,5 @@ document.fcategoryform.ca_name.focus();
-include_once ("$g4[admin_path]/admin.tail.php");
+include_once(G4_ADMIN_PATH."/admin.tail.php");
?>
\ No newline at end of file
diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php
index 495962d55..6796b4628 100644
--- a/adm/shop_admin/categorylist.php
+++ b/adm/shop_admin/categorylist.php
@@ -33,7 +33,7 @@ if ($ca_id && ($move == 'up' || $move == 'down')) {
}
$g4[title] = "분류관리";
-include_once ("$g4[admin_path]/admin.head.php");
+include_once(G4_ADMIN_PATH."/admin.head.php");
$where = " where ";
@@ -273,5 +273,5 @@ $(function() {
-include_once ("$g4[admin_path]/admin.tail.php");
+include_once(G4_ADMIN_PATH."/admin.tail.php");
?>
diff --git a/adm/shop_admin/categoryorder.php b/adm/shop_admin/categoryorder.php
index 702b445f3..f743d0663 100644
--- a/adm/shop_admin/categoryorder.php
+++ b/adm/shop_admin/categoryorder.php
@@ -2,7 +2,7 @@
$sub_menu = "400210";
include_once("./_common.php");
$g4[title] = $html_title;
-include_once ("$g4[admin_path]/admin.head.php");
+include_once(G4_ADMIN_PATH."/admin.head.php");
?>