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

doc/erd/g4s/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>G4S</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

extend/shop.extend.php

@@ -73,17 +73,21 @@ $g4['shop_item_info_table']     = G4_TABLE_PREFIX.'shop_item_info';
 
 
 //==============================================================================
-// 주문상태를 & 연산을 위해 상수로 선언
-// 중간에 주석처리된 숫자는 중간에 추가될수 있으므로 여분으로 남긴다.
+// 주문상태를 선언
+// 실제 주문테이블에는 set 방식으로 들어감
 //------------------------------------------------------------------------------
 // 절대 수정하시면 안됩니다.
 //------------------------------------------------------------------------------
-define('G4_STATUS_CART', '장바구니');
-define('G4_STATUS_ORDER', '입금대기');
-define('G4_STATUS_SETTLE', '결제완료');
-define('G4_STATUS_STANDBY', '배송준비');
-define('G4_STATUS_DELIVERY', '배송완료');
-define('G4_STATUS_PURCHASE', '구매확정');
+define('G4_STATUS_CART',        '장바구니');
+define('G4_STATUS_STANDBY',     '입금대기');
+define('G4_STATUS_PAYMENT',     '결제완료');
+define('G4_STATUS_READY',       '배송준비중');
+define('G4_STATUS_DELIVERY',    '배송중');
+define('G4_STATUS_COMPLETE',    '배송완료');
+define('G4_STATUS_END',         '구매확정');
+define('G4_STATUS_CANCEL',      '취소');
+define('G4_STATUS_RETURN',      '반품');
+define('G4_STATUS_EXCHANGE',    '교환');
 
 
 //==============================================================================

shop/cartcoupon.php

@@ -134,8 +134,8 @@ $sql = " select *
             from {$g4['shop_coupon_table']}
             where cp_use = '1'
               and cp_type = '0'
-              and cp_start <= '{$g4['time_ymd']}'
-              and cp_end >= '{$g4['time_ymd']}'
+              and cp_start <= '".G4_TIME_YMD."'
+              and cp_end >= '".G4_TIME_YMD."'
               and ( it_id  = '{$it['it_id']}' or cp_target = '2' )
               and mb_id in ( '{$member['mb_id']}', '전체회원' )
               and ca_id in ( '{$it['ca_id']}', '{$it['ca_id2']}', '{$it['ca_id3']}', '전체카테고리' )
@@ -189,7 +189,7 @@ if(!$cnt) {
 }
 
 $g4['title'] = '쿠폰적용';
-include_once ($g4['path'].'/head.sub.php');
+include_once (G4_PATH.'/head.sub.php');
 ?>
 
 <style type="text/css">
@@ -380,5 +380,5 @@ $(function() {
 </script>
 
 <?php
-include_once($g4['path'] . '/tail.sub.php');
+include_once(G4_PATH . '/tail.sub.php');
 ?>

shop/cartsub.inc.php

@@ -210,8 +210,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
                             from {$g4['shop_coupon_table']}
                             where cp_use = '1'
                               and cp_type = '0'
-                              and cp_start <= '{$g4['time_ymd']}'
-                              and cp_end >= '{$g4['time_ymd']}'
+                              and cp_start <= '".G4_TIME_YMD."'
+                              and cp_end >= '".G4_TIME_YMD."'
                               and ( it_id  = '{$row['it_id']}' or cp_target = '2' )
                               and mb_id in ( '{$member['mb_id']}', '전체회원' )
                               and ca_id in ( '{$row['ca_id']}', '{$row['ca_id2']}', '{$row['ca_id3']}', '전체카테고리' ) ";

shop/orderform.php

@@ -444,8 +444,8 @@ if($is_member) {
                     where cp_type = '2'
                       and cp_use = '1'
                       and mb_id in ( '{$member['mb_id']}', '전체회원' )
-                      and cp_start <= '{$g4['time_ymd']}'
-                      and cp_end >= '{$g4['time_ymd']}' ";
+                      and cp_start <= '".G4_TIME_YMD."'
+                      and cp_end >= '".G4_TIME_YMD."' ";
         $result = sql_query($sql);
         for($k=0; $row=sql_fetch_array($result); $k++) {
             // 최소결제금액이 있다면 체크
@@ -475,8 +475,8 @@ if($is_member) {
                 where cp_type = '1'
                   and cp_use = '1'
                   and mb_id in ( '{$member['mb_id']}', '전체회원' )
-                  and cp_start <= '{$g4['time_ymd']}'
-                  and cp_end >= '{$g4['time_ymd']}' ";
+                  and cp_start <= '".G4_TIME_YMD."'
+                  and cp_end >= '".G4_TIME_YMD."' ";
     $result = sql_query($sql);
 
     for($k=0; $row=sql_fetch_array($result); $k++) {