firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source 
Conflicts:
	adm/admin.menu500.shop_2of2.php
This commit is contained in:
gnuboard
2013-01-28 17:21:53 +09:00
parent a47f731488 e82fa69b4c
commit be5ea2287a
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adm/admin.menu500.shop_2of2.php
View File

@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return; if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu['menu500'] = array ( $menu['menu500'] = array (
<<<<<<< HEAD
array('500000', '쇼핑몰현황/기타', G4_SHOP_ADMIN_URL.'/itemsellrank.php'), array('500000', '쇼핑몰현황/기타', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
array('500100', '상품판매순위', G4_SHOP_ADMIN_URL.'/itemsellrank.php'), array('500100', '상품판매순위', G4_SHOP_ADMIN_URL.'/itemsellrank.php'),
array('500110', '매출현황', G4_SHOP_ADMIN_URL.'/sale1.php'), array('500110', '매출현황', G4_SHOP_ADMIN_URL.'/sale1.php'),
@ -12,5 +13,16 @@ $menu['menu500'] = array (
array('500200', 'SMS 문자전송', G4_SHOP_ADMIN_URL.'/smssend.php'), array('500200', 'SMS 문자전송', G4_SHOP_ADMIN_URL.'/smssend.php'),
array('500210', '가격비교사이트', G4_SHOP_ADMIN_URL.'/price.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'),
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')
>>>>>>> e82fa69b4c2eeb9e9eb9eefa11b485ed5a6846c6
); );
?> ?>

3
adm/shop_admin/itemform.php
View File

@ -1,7 +1,8 @@
<? <?
$sub_menu = "400300"; $sub_menu = "400300";
define('G4_EDITOR', 1); //define('G4_EDITOR', 1);
include_once("./_common.php"); include_once("./_common.php");
include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
auth_check($auth[$sub_menu], "w"); auth_check($auth[$sub_menu], "w");