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
This commit is contained in:
whitedot
2013-01-28 15:29:14 +09:00
parent 75eb6ad9dc 28fcf2646f
commit d602beae4f
11 changed files with 139 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.menu400.shop_1of2.php
View File

@ -1,6 +1,6 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!defined('G4_IS_SHOP') || !G4_IS_SHOP) return;
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu["menu400"] = array (
array("400000", "쇼핑몰관리", "$g4[shop_admin_path]/"),

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

@ -1,6 +1,6 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!defined('G4_IS_SHOP') || !G4_IS_SHOP) return;
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu["menu500"] = array (
array("500000", "쇼핑몰현황/기타", "$g4[shop_admin_path]/itemsellrank.php"),

2
extend/shop.extend.php
View File

@ -1,6 +1,6 @@
<?
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
//if (!defined('G4_IS_SHOP') || !G4_IS_SHOP) return;
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
include_once(G4_LIB_PATH.'/shop.lib.php');

7
js/common.js
View File

@ -289,13 +289,6 @@ function win_open(url, name, option)
popup.focus();
}
// 우편번호 창
function win_zip(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2)
{
url = g4_path + "/" + g4_bbs + "/zip.php?frm_name="+frm_name+"&frm_zip1="+frm_zip1+"&frm_zip2="+frm_zip2+"&frm_addr1="+frm_addr1+"&frm_addr2="+frm_addr2;
win_open(url, "winZip", "left=50,top=50,width=616,height=460,scrollbars=1");
}
// 새로운 패스워드 분실 창 : 100902
function win_password_lost()
{

5
lib/outlogin.lib.php
View File

@ -51,10 +51,11 @@ function outlogin($skin_dir='basic')
$outlogin_url = $urlencode;
}
// 보안서버주소를 적용할 마땅한 방법이 나올때까지 이 코드로 사용한다.
if ($g4['https_url'])
$outlogin_action_url = "{$g4['https_url']}/$g4[bbs]/login_check.php";
$outlogin_action_url = G4_BBS_URL.'/login_check.php';
else
$outlogin_action_url = "{$g4['bbs_url']}/login_check.php";
$outlogin_action_url = G4_BBS_URL.'/login_check.php';
ob_start();
if ($is_member)

5
shop/_common.php
View File

@ -1,4 +1,5 @@
<?
$g4_path = "..";
include_once("$g4_path/common.php");
include_once("../common.php");
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP)
die("현재 쇼핑몰 사용 안함으로 설정되어 있습니다.<br>config.user.php 에 define('G4_USE_SHOP', true); 로 설정해 주세요.");
?>

8
shop/cartsub.inc.php
View File

@ -274,10 +274,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
{
switch($row['ct_status'])
{
case '주문' : $icon = "<img src=\"{$g4['shop_img_path']}/status01.gif\">"; break;
case '준비' : $icon = "<img src=\"{$g4['shop_img_path']}/status02.gif\">"; break;
case '배송' : $icon = "<img src=\"{$g4['shop_img_path']}/status03.gif\">"; break;
case '완료' : $icon = "<img src=\"{$g4['shop_img_path']}/status04.gif\">"; break;
case '주문' : $icon = "<img src=\"".G4_SHOP_IMG_URL."/status01.gif\">"; break;
case '준비' : $icon = "<img src=\"".G4_SHOP_IMG_URL."/status02.gif\">"; break;
case '배송' : $icon = "<img src=\"".G4_SHOP_IMG_URL."/status03.gif\">"; break;
case '완료' : $icon = "<img src=\"".G4_SHOP_IMG_URL."/status04.gif\">"; break;
default : $icon = $row['ct_status']; break;
}
echo "<td align=\"center\">$icon</td>\n";

0
shop/kcp/bin/pp_cli Normal file → Executable file
View File

30
shop/orderform.php
View File

@ -21,7 +21,7 @@ $g4['title'] = '주문서 작성';
include_once('./_head.php');
?>
<img src="<?=$g4['shop_img_path']?>/top_orderform.gif" border="0"><p>
<img src="<?=G4_SHOP_IMG_URL?>/top_orderform.gif" border="0"><p>
<?
$s_page = 'orderform.php';
@ -38,8 +38,8 @@ if (file_exists("./settle_{$default['de_card_pg']}.inc.php")) {
include "./settle_{$default['de_card_pg']}.inc.php";
}
if ($g4['https_url'])
$action_url = $g4['https_url'].'/'.$g4['shop'].'/orderformupdate.php';
if (G4_HTTPS_URL)
$action_url = G4_HTTPS_URL.'/'.$g4['shop'].'/orderformupdate.php';
else
$action_url = './orderformupdate.php';
?>
@ -563,7 +563,7 @@ if($is_member) {
<colgroup width="140">
<colgroup width="">
<tr>
<td bgcolor="#F3F2FF" align="center"><img src="<? echo $g4['shop_img_path']; ?>/t_data01.gif"></td>
<td bgcolor="#F3F2FF" align="center"><img src="<? echo G4_SHOP_IMG_URL; ?>/t_data01.gif"></td>
<td bgcolor="#FAFAFA" style="padding-left:10px">
<table cellpadding="3">
<colgroup width="100">
@ -589,14 +589,17 @@ if($is_member) {
<td>핸드폰</td>
<td><input type="text" name="od_hp" value="<? echo $member['mb_hp']; ?>" maxlength="20" class="ed"></td>
</tr>
<?
$zip_href = G4_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2';
?>
<tr>
<td rowspan=2>주 소</td>
<td>
<input type="text" name="od_zip1" size="3" maxlength="3" value="<? echo $member['mb_zip1']; ?>" class="ed" readonly>
-
<input type="text" name="od_zip2" size="3" maxlength="3" value="<? echo $member['mb_zip2']; ?>" class="ed" readonly>
<a href="javascript:;" onclick="win_zip('forderform', 'od_zip1', 'od_zip2', 'od_addr1', 'od_addr2');"><img
src="<? echo $g4['shop_img_path']?>/btn_zip_find.gif" border="0" align="absmiddle"></a>
<a href="<?=$zip_href?>" onclick="win_zip(this.href); return false;"><img
src="<? echo G4_SHOP_IMG_URL; ?>/btn_zip_find.gif" border="0" align="absmiddle"></a>
</td>
</tr>
<tr>
@ -634,7 +637,7 @@ if($is_member) {
<colgroup width="140">
<colgroup width="">
<tr>
<td bgcolor="#F3F2FF" align="center"><img src="<? echo $g4['shop_img_path']?>/t_data03.gif"></td>
<td bgcolor="#F3F2FF" align="center"><img src="<? echo G4_SHOP_IMG_URL; ?>/t_data03.gif"></td>
<td bgcolor="#FAFAFA" style="padding-left:10px">
<table cellpadding="3">
<colgroup width="100">
@ -656,14 +659,17 @@ if($is_member) {
<td>핸드폰</td>
<td><input type="text" name="od_b_hp" class="ed" maxlength="20"></td>
</tr>
<?
$zip_href = G4_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2';
?>
<tr>
<td rowspan="2">주 소</td>
<td>
<input type="text" name="od_b_zip1" size="3" maxlength="3" class="ed" readonly>
-
<input type="text" name="od_b_zip2" size="3" maxlength="3" class="ed" readonly>
<a href="javascript:;" onclick="win_zip('forderform', 'od_b_zip1', 'od_b_zip2', 'od_b_addr1', 'od_b_addr2');"><img
src="<? echo $g4['shop_img_path']?>/btn_zip_find.gif" border="0" align="absmiddle"></a>
<a href="<?=$zip_href?>" onclick="win_zip(this.href); return false;"><img
src="<? echo G4_SHOP_IMG_URL; ?>/btn_zip_find.gif" border="0" align="absmiddle"></a>
</a>
</td>
</tr>
@ -687,7 +693,7 @@ if($is_member) {
<colgroup width="140">
<colgroup width="">
<tr>
<td bgcolor="#FFEFFD" align="center"><img src="<? echo $g4['shop_img_path']?>/t_data04.gif"></td>
<td bgcolor="#FFEFFD" align="center"><img src="<? echo G4_SHOP_IMG_URL; ?>/t_data04.gif"></td>
<td bgcolor="#FAFAFA" style="padding-left:10px">
<table cellpadding="3">
<tr>
@ -808,7 +814,7 @@ if($is_member) {
<!-- 결제하기 -->
<table width="100%" align="center" cellpadding="0" cellspacing="10" border="0">
<tr id="display_pay_button" style="display:none">
<td align="center"><input type="image" id="order_submit" src="<? echo $g4['shop_img_path']; ?>/btn_next2.gif" border="0" alt="결제하기" />&nbsp;<a href='javascript:history.go(-1);'><img src="<? echo $g4['shop_img_path']; ?>/btn_back1.gif" alt="뒤로" border="0"></a></td>
<td align="center"><input type="image" id="order_submit" src="<? echo G4_SHOP_IMG_URL; ?>/btn_next2.gif" border="0" alt="결제하기" />&nbsp;<a href='javascript:history.go(-1);'><img src="<? echo G4_SHOP_IMG_URL; ?>/btn_back1.gif" alt="뒤로" border="0"></a></td>
</tr>
<!-- Payplus Plug-in 설치 안내 -->
<tr id="display_setup_message" style="display:none">
@ -842,7 +848,7 @@ function escrow_foot_check()
<input type="hidden" name="site_cd" value="<? echo $default['de_kcp_mid']; ?>">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center"><img src="<? echo $g4['shop_path']; ?>/img/marks_escrow/escrow_foot.gif" width="290" height="92" border="0" usemap="#Map"></td>
<td align="center"><img src="<? echo G4_SHOP_IMG_URL; ?>/marks_escrow/escrow_foot.gif" width="290" height="92" border="0" usemap="#Map"></td>
</tr>
<tr>
<td style='line-height:150%;'>

2
shop/orderformupdate.php
View File

@ -764,7 +764,7 @@ if($default['de_guest_cart_use']) {
set_session('ss_inquiry_uniqid', $od_id);
set_session('ss_inquiry_direct', $sw_direct);
goto_url("{$g4['url']}/{$g4['shop']}/orderinquiryview.php?od_id=$od_id");
goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id");
?>
<html>

14
shop/orderinquiryview.php
View File

@ -23,7 +23,7 @@ $g4['title'] = "주문상세내역 : 주문번호 - $od_id";
include_once('./_head.php');
?>
<img src="<?=$g4['shop_img_path']?>/top_orderinquiryview.gif" border=0><p>
<img src="<?=G4_SHOP_IMG_URL?>/top_orderinquiryview.gif" border=0><p>
<?
$s_uq_id = $od['od_id'];
@ -40,13 +40,13 @@ if(openwin != null) {
</script>
<br>
<div align=right><img src='<?=$g4[shop_img_path]?>/status01.gif' align=absmiddle> : 주문대기, <img src='<?=$g4[shop_img_path]?>/status02.gif' align=absmiddle> : 상품준비중, <img src='<?=$g4[shop_img_path]?>/status03.gif' align=absmiddle> : 배송중, <img src='<?=$g4[shop_img_path]?>/status04.gif' align=absmiddle> : 배송완료</div>
<div align=right><img src='<?=G4_SHOP_IMG_URL?>/status01.gif' align=absmiddle> : 주문대기, <img src='<?=G4_SHOP_IMG_URL?>/status02.gif' align=absmiddle> : 상품준비중, <img src='<?=G4_SHOP_IMG_URL?>/status03.gif' align=absmiddle> : 배송중, <img src='<?=G4_SHOP_IMG_URL?>/status04.gif' align=absmiddle> : 배송완료</div>
<table width=98% cellpadding=0 cellspacing=7 align=center>
<tr><td colspan=2>
<img src='<?=$g4[shop_img_path]?>/my_icon.gif' align=absmiddle> <B>주문번호 : <FONT COLOR="#D60B69"><?=$od[od_id]?></FONT></B></td></tr>
<img src='<?=G4_SHOP_IMG_URL?>/my_icon.gif' align=absmiddle> <B>주문번호 : <FONT COLOR="#D60B69"><?=$od[od_id]?></FONT></B></td></tr>
<tr><td colspan=2 height=2 bgcolor=#94A9E7></td></tr>
<tr><td align=center bgcolor=#F3F2FF><img src='<?=$g4[shop_img_path]?>/t_data02.gif'></td>
<tr><td align=center bgcolor=#F3F2FF><img src='<?=G4_SHOP_IMG_URL?>/t_data02.gif'></td>
<td style='padding:20px'>
<table cellpadding=4 cellspacing=0>
<colgroup width=120>
@ -59,7 +59,7 @@ if(openwin != null) {
<tr><td>· E-mail</td><td>: <? echo $od[od_email] ?></td></tr>
</table></td></tr>
<tr><td colspan=2 height=1 bgcolor=#738AC6></td></tr>
<tr><td align=center bgcolor=#F3F2FF><img src='<?=$g4[shop_img_path]?>/t_data03.gif'></td>
<tr><td align=center bgcolor=#F3F2FF><img src='<?=G4_SHOP_IMG_URL?>/t_data03.gif'></td>
<td style='padding:20px'>
<table cellpadding=4 cellspacing=0>
<colgroup width=120>
@ -94,7 +94,7 @@ $dl = sql_fetch(" select * from $g4[yc4_delivery_table] where dl_id = '$od[dl_id
if ($od[od_invoice] || !$od[misu])
{
echo "<tr><td align=center bgcolor='#F3F2FF'><img src='$g4[shop_img_path]/t_data05.gif'></td>";
echo "<tr><td align=center bgcolor='#F3F2FF'><img src='".G4_SHOP_IMG_URL."/t_data05.gif'></td>";
echo "<td style='padding:20px'>";
if (is_array($dl))
{
@ -127,7 +127,7 @@ if ($od['od_amount'] == $od['od_receipt_amount']) {
$misu_amount = $od['od_amount'] - $od['od_receipt_amount'];
echo "<tr>";
echo "<td align=center bgcolor=#FFEFFD height=60><img src='$g4[shop_img_path]/t_data04.gif'></td>";
echo "<td align=center bgcolor=#FFEFFD height=60><img src='".G4_SHOP_IMG_URL."/t_data04.gif'></td>";
echo "<td style='padding:20px'>";
if ($od['od_settle_case'] == '신용카드')