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

adm/shop_admin/couponformupdate.php

@@ -77,9 +77,9 @@ if($w == '') {
     } while(1);
 
     $sql = " INSERT INTO {$g4['shop_coupon_table']}
-                ( cp_id, cp_subject, cp_method, cp_target, mb_id, cp_start, cp_end, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum, cp_used, cp_datetime )
+                ( cp_id, cp_subject, cp_method, cp_target, mb_id, cp_start, cp_end, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum, cp_datetime )
             VALUES
-                ( '$cp_id', '$cp_subject', '$cp_method', '$cp_target', '$mb_id', '$cp_start', '$cp_end', '$cp_type', '$cp_price', '$cp_trunc', '$cp_minimum', '$cp_maximum', '$cp_used', '".G4_TIME_YMDHIS."' ) ";
+                ( '$cp_id', '$cp_subject', '$cp_method', '$cp_target', '$mb_id', '$cp_start', '$cp_end', '$cp_type', '$cp_price', '$cp_trunc', '$cp_minimum', '$cp_maximum', '".G4_TIME_YMDHIS."' ) ";
 
     sql_query($sql);
 } else if($w == 'u') {

adm/shop_admin/couponlist.php

@@ -81,7 +81,6 @@ $colspan = 8;
     <ul class="sort_odr">
         <li><?php echo subject_sort_link('mb_id') ?>회원아이디<span class="sound_only"> 순 정렬</span></a></li>
         <li><?php echo subject_sort_link('cp_end') ?>사용기한<span class="sound_only"> 순 정렬</span></a></li>
-        <li><?php echo subject_sort_link('cp_used') ?>사용<span class="sound_only"> 순 정렬</span></a></li>
     </ul>
 
     <form name="fcouponlist" id="fcouponlist" method="post" action="./couponlist_delete.php" onsubmit="return fcouponlist_submit(this);">

adm/shop_admin/index.php

@@ -119,7 +119,7 @@ $pg_anchor = '<ul class="anchor">
     <tr>
         <td class="td_odrnum2"><a href="./orderstatuslist.php?sort1=od_id&amp;sel_field=od_id&amp;search=<?php echo $row['od_id']; ?>"><?php echo $row['od_id']; ?></a></td>
         <td class="td_name"><?php echo $name; ?></td>
-        <td class="td_bignum"><?php echo display_price($row['orderamount']); ?></td>
+        <td class="td_bignum"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
         <td class="td_payby"><?php echo $settle_method; ?></td>
         <td class="td_smallmng"><a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>">수정</a></td>
     </tr>
@@ -131,7 +131,7 @@ $pg_anchor = '<ul class="anchor">
     </table>
 
     <div class="btn_ft">
-        <a href="./orderlist.php?sort1=receiptamount&amp;sort2=asc">미입금 주문내역 더보기</a>
+        <a href="./orderlist.php?sort1=od_receipt_price&amp;sort2=asc">미입금 주문내역 더보기</a>
     </div>
 </section>
 

adm/shop_admin/ordercartupdate.php

@@ -158,6 +158,78 @@ for ($i=0; $i<$cnt; $i++)
     sql_query($sql);
 }
 
+// 주문정보
+$sql = " select * from {$g4['shop_order_table']} where od_id = '$od_id' ";
+$od = sql_fetch($sql);
+
+// 주문 합계
+$sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price,
+                SUM(cp_price) as coupon
+            from {$g4['shop_cart_table']}
+            where od_id = '$od_id'
+              and ct_status IN ( '주문', '준비', '배송', '완료' ) ";
+$sum = sql_fetch($sql);
+$cart_price = $sum['price'];
+$cart_coupon = $sum['coupon'];
+
+// 주문할인 쿠폰
+$sql = " select cp_id, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum
+            from {$g4['shop_coupon_table']}
+            where od_id = '$od_id'
+              and cp_method = '2' ";
+$cp = sql_fetch($sql);
+
+if($cp['cp_id']) {
+    $dc = 0;
+    $tot_od_price = $cart_price - $cart_coupon;
+
+    if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_price)) {
+        if($cp['cp_type']) {
+            $dc = floor(($tot_od_price * ($cp['cp_price'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc'];
+        } else {
+            $dc = $cp['cp_price'];
+        }
+
+        if($cp['cp_maximum'] && $dc > $cp['cp_maximum'])
+            $dc = $cp['cp_maximum'];
+
+        if($tot_od_price < $dc)
+            $dc = $tot_od_price;
+    }
+}
+
+// 배송비
+$send_cost = get_sendcost($cart_price, $od_id);
+
+// 취소 합계
+$sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price,
+              SUM(cp_price) as coupon
+            from {$g4['shop_cart_table']}
+            where od_id = '$od_id'
+              and ct_status IN ( '취소', '반품', '품절' ) ";
+$sum = sql_fetch($sql);
+$cancel_price = $sum['price'];
+$cancel_coupon = $sum['coupon'];
+
+// 배송비가 배송비 쿠폰보다 작다면 쿠폰금액으로 설정
+if($send_cost < $od['od_send_coupon'])
+    $send_cost = $od['od_send_coupon'];
+
+// 미수
+$od_misu = $od['od_cart_price'] + $send_cost + $od['od_send_cost2']
+            - ($od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'])
+            - ($od['od_receipt_price'] + $od['od_receipt_point'])
+            + $cancel_coupon
+            + ($od['od_coupon'] - $dc);
+
+// 주문정보 반영
+$sql = " update {$g4['shop_order_table']}
+            set od_cancel_price = '$cancel_price',
+                od_send_cost    = '$send_cost',
+                od_misu         = '$od_misu'
+            where od_id = '$od_id' ";
+sql_query($sql);
+
 $qstr = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search&amp;page=$page";
 
 $url = "./orderform.php?od_id=$od_id&amp;$qstr";

adm/shop_admin/orderlist.php

@@ -63,7 +63,8 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql  = " select *
+$sql  = " select *,
+            (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
            $sql_common
            order by $sort1 $sort2
            limit $from_record, $rows ";
@@ -132,7 +133,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         <li><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금<span class="sound_only"> 순 정렬</span></a></li>
     </ul>
 
-    주문상태 : 
+    주문상태 :
     <ul id="sort_sodr" class="sort_odr">
         <li><a href="<?php $_SERVER['PHP_SELF']; ?>?od_status=<?php echo G4_OD_STATUS_ORDER; ?>"><?php echo G4_OD_STATUS_ORDER; ?></a></li>
         <li><a href="<?php $_SERVER['PHP_SELF']; ?>?od_status=<?php echo G4_OD_STATUS_SETTLE; ?>"><?php echo G4_OD_STATUS_SETTLE; ?></a></li>
@@ -205,10 +206,10 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
             </a>
         </td>
         <td class="td_sodr_cnt"><b><?php echo $row['od_cart_count']; ?></b>건<?php if($od_cnt) { ?><br>누적 <?php echo $od_cnt; ?>건<?php } ?></td>
-        <td class="td_sodr_sum"><?php echo number_format($row['od_cart_price']); ?></td>
+        <td class="td_sodr_sum"><?php echo number_format($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
         <td><?php echo number_format($row['od_receipt_price']); ?></td>
         <td><?php echo number_format($row['od_cancel_price']); ?></td>
-        <td class="td_sodr_sum"><?php echo number_format($row['couponamount']); ?></td>
+        <td class="td_sodr_sum"><?php echo number_format($row['couponprice']); ?></td>
         <td class="td_sodr_nonpay"><?php echo number_format($row['od_misu']); ?></td>
         <td><?php echo $s_receipt_way; ?></td>
         <td class="td_mng">
@@ -221,7 +222,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         $tot_orderprice    += $row['od_cart_price'];
         $tot_ordercancel   += $row['od_cancel_price'];
         $tot_receiptprice  += $row['od_receipt_price'];
-        $tot_couponamount  += $row['couponamount'];
+        $tot_couponprice   += $row['couponprice'];
         $tot_misu          += $row['od_misu'];
     }
     mysql_free_result($result);
@@ -236,7 +237,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         <td><?php echo number_format($tot_orderprice); ?></td>
         <td><?php echo number_format($tot_receiptprice); ?></td>
         <td><?php echo number_format($tot_ordercancel); ?></td>
-        <td><?php echo number_format($tot_couponamount); ?></td>
+        <td><?php echo number_format($tot_couponprice); ?></td>
         <td><?php echo number_format($tot_misu); ?></td>
         <td colspan="2"></td>
     </tr>

adm/shop_admin/orderlist2.php

@@ -37,7 +37,8 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql  = " select *
+$sql  = " select *,
+            (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
            $sql_common
            order by $sort1 $sort2
            limit $from_record, $rows ";
@@ -126,7 +127,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
             $tot_orderprice    += $row['od_cart_price'];
             $tot_ordercancel   += $row['od_cancel_price'];
             $tot_receiptprice  += $row['od_receipt_price'];
-            $tot_couponamount  += $row['couponamount'];
+            $tot_couponprice   += $row['couponprice'];
             $tot_misu          += $row['misu'];
 
             $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
@@ -161,13 +162,13 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
 
             <dl class="sodr_pay">
                 <dt class="sodr_pay_1">주문합계</dt>
-                <dd class="sodr_pay_1"><?php echo number_format($row['od_cart_price']); ?></dd>
+                <dd class="sodr_pay_1"><?php echo number_format($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></dd>
                 <dt class="sodr_pay_1">결제수단</dt>
                 <dd class="sodr_pay_1"><?php echo $s_receipt_way; ?></dd>
                 <dt class="sodr_pay_1">입금합계</dt>
                 <dd class="sodr_pay_1"><?php echo number_format($row['od_receipt_price']); ?></dd>
                 <dt>쿠폰사용</dt>
-                <dd><?php echo number_format($row['couponamount']); ?></dd>
+                <dd><?php echo number_format($row['couponprice']); ?></dd>
                 <dt>주문취소</dt>
                 <dd><?php echo number_format($row['od_cancel_price']); ?></dd>
                 <dt>미수금</dt>
@@ -279,10 +280,10 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     <tbody>
     <tr>
         <td><?php echo (int)$tot_itemcount; ?>건</td>
-        <td><?php echo number_format($tot_orderamount); ?></td>
+        <td><?php echo number_format($tot_orderprice); ?></td>
-        <td><?php echo number_format($tot_couponamount); ?></td>
+        <td><?php echo number_format($tot_couponprice); ?></td>
         <td><?php echo number_format($tot_ordercancel); ?></td>
-        <td><?php echo number_format($tot_receiptamount); ?></td>
+        <td><?php echo number_format($tot_receiptprice); ?></td>
         <td><?php echo number_format($tot_misu); ?></td>
     </tr>
     </tbody>

adm/shop_admin/sale1date.php

@@ -37,7 +37,8 @@ $sql = " select od_id,
             od_cart_price,
             od_cancel_price,
             od_misu,
-            (od_cart_coupon + od_coupon + od_send_coupon) as couponamount
+            (od_cart_price + od_send_cost + od_send_cost2) as orderprice,
+            (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
        from {$g4['shop_order_table']}
       where SUBSTRING(od_time,1,10) between '$fr_date' and '$to_date'
       order by od_time desc ";
@@ -77,9 +78,9 @@ $result = sql_query($sql);
         }
 
         $save['ordercount']++;
-        $save['orderprice']    += $row['od_cart_price'];
+        $save['orderprice']    += $row['orderprice'];
         $save['ordercancel']   += $row['od_cancel_price'];
-        $save['ordercoupon']   += $row['couponamount'];
+        $save['ordercoupon']   += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $save['receiptbank']   += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')
@@ -88,9 +89,9 @@ $result = sql_query($sql);
         $save['misu']          += $row['od_misu'];
 
         $tot['ordercount']++;
-        $tot['orderprice']     += $row['od_cart_price'];
+        $tot['orderprice']     += $row['orderprice'];
-        $tot['ordercancel']    += $row1['od_cancel_price'];
+        $tot['ordercancel']    += $row['od_cancel_price'];
-        $tot['ordercoupon']    += $row['couponamount'];
+        $tot['ordercoupon']    += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $tot['receiptbank']    += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')

adm/shop_admin/sale1month.php

@@ -23,7 +23,7 @@ function print_line($save)
         <td><?php echo number_format($save['receiptbank']); ?></td>
         <td><?php echo number_format($save['receiptcard']); ?></td>
         <td><?php echo number_format($save['receiptpoint']); ?></td>
-        <td><?php echo number_format($save['receiptcancel']); ?></td>
+        <td><?php echo number_format($save['ordercancel']); ?></td>
         <td><?php echo number_format($save['misu']); ?></td>
     </tr>
     <?php
@@ -38,7 +38,8 @@ $sql = " select od_id,
             od_cart_price,
             od_cancel_price,
             od_misu,
-            (od_cart_coupon + od_coupon + od_send_coupon) as couponamount
+            (od_cart_price + od_send_cost + od_send_cost2) as orderprice,
+            (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
        from {$g4['shop_order_table']}
       where SUBSTRING(od_time,1,7) between '$fr_month' and '$to_month'
       order by od_time desc ";
@@ -78,9 +79,9 @@ $result = sql_query($sql);
         }
 
         $save['ordercount']++;
-        $save['orderprice']    += $row['od_cart_price'];
+        $save['orderprice']    += $row['orderprice'];
         $save['ordercancel']   += $row['od_cancel_price'];
-        $save['ordercoupon']   += $row['couponamount'];
+        $save['ordercoupon']   += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $save['receiptbank']   += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')
@@ -89,9 +90,9 @@ $result = sql_query($sql);
         $save['misu']          += $row['od_misu'];
 
         $tot['ordercount']++;
-        $tot['orderprice']    += $row['od_cart_price'];
+        $tot['orderprice']    += $row['orderprice'];
         $tot['ordercancel']   += $row['od_cancel_price'];
-        $tot['ordercoupon']   += $row['couponamount'];
+        $tot['ordercoupon']   += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $tot['receiptbank']   += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')

adm/shop_admin/sale1today.php

@@ -18,7 +18,8 @@ $sql = " select od_id,
                 od_receipt_point,
                 od_cancel_price,
                 od_misu,
-                (od_cart_coupon + od_coupon + od_send_coupon) as couponamount
+                (od_cart_price + od_send_cost + od_send_cost2) as orderprice,
+                (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
            from {$g4['shop_order_table']}
           where SUBSTRING(od_time,1,10) = '$date'
           order by od_id desc ";
@@ -63,8 +64,8 @@ $result = sql_query($sql);
         <tr>
             <td class="td_odrnum2"><a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>"><?php echo $row['od_id']; ?></a></td>
             <td class="td_name"><?php echo $href; ?><?php echo $row['od_name']; ?></a></td>
-            <td class="td_num"><?php echo number_format($row['od_cart_price']); ?></td>
+            <td class="td_num"><?php echo number_format($row['orderprice']); ?></td>
-            <td class="td_num"><?php echo number_format($row['couponamount']); ?></td>
+            <td class="td_num"><?php echo number_format($row['couponprice']); ?></td>
             <td class="td_num"><?php echo number_format($receipt_bank); ?></td>
             <td class="td_num"><?php echo number_format($receipt_card); ?></td>
             <td class="td_num"><?php echo number_format($row['od_receipt_point']); ?></td>
@@ -72,9 +73,9 @@ $result = sql_query($sql);
             <td class="td_num"><?php echo number_format($row['od_misu']); ?></td>
         </tr>
     <?php
-        $tot['orderprice']    += $row['od_cart_price'];
+        $tot['orderprice']    += $row['orderprice'];
-        $tot['ordercancel']   += $row1['od_cancel_price'];
+        $tot['ordercancel']   += $row['od_cancel_price'];
-        $tot['coupon']        += $row['couponamount'] ;
+        $tot['coupon']        += $row['couponprice'] ;
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $tot['receipt_bank']  += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')

adm/shop_admin/sale1year.php

@@ -18,7 +18,7 @@ function print_line($save)
         <td><?php echo number_format($save['receiptbank']); ?></td>
         <td><?php echo number_format($save['receiptcard']); ?></td>
         <td><?php echo number_format($save['receiptpoint']); ?></td>
-        <td><?php echo number_format($save['receiptcancel']); ?></td>
+        <td><?php echo number_format($save['ordercancel']); ?></td>
         <td><?php echo number_format($save['misu']); ?></td>
     </tr>
     <?php
@@ -33,7 +33,8 @@ $sql = " select od_id,
                 od_cart_price,
                 od_cancel_price,
                 od_misu,
-                (od_cart_coupon + od_coupon + od_send_coupon) as couponamount
+                (od_cart_price + od_send_cost + od_send_cost2) as orderprice,
+                (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
            from {$g4['shop_order_table']}
           where SUBSTRING(od_time,1,4) between '$fr_year' and '$to_year'
           order by od_time desc ";
@@ -73,9 +74,9 @@ $result = sql_query($sql);
         }
 
         $save['ordercount']++;
-        $save['orderprice']    += $row['od_cart_price'];
+        $save['orderprice']    += $row['orderprice'];
         $save['ordercancel']   += $row['od_cancel_price'];
-        $save['ordercoupon']   += $row['couponamount'];
+        $save['ordercoupon']   += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $save['receiptbank']   += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')
@@ -84,9 +85,9 @@ $result = sql_query($sql);
         $save['misu']          += $row['od_misu'];
 
         $tot['ordercount']++;
-        $tot['orderprice']    += $row['od_cart_price'];
+        $tot['orderprice']    += $row['orderprice'];
-        $tot['ordercancel']   += $row1['od_cancel_price'];
+        $tot['ordercancel']   += $row['od_cancel_price'];
-        $tot['ordercoupon']   += $row['couponamount'];
+        $tot['ordercoupon']   += $row['couponprice'];
         if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
             $tot['receiptbank']   += $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')

css/default_shop.css

@@ -460,7 +460,7 @@ td.empty_table {padding:85px 0;text-align:center}
 #sit_ov_btn {margin:0 0 0 34px !important;margin:0 0 0 33px;padding:0;list-style:none;zoom:1}
 #sit_ov_btn:after {display:block;visibility:hidden;clear:both;content:""}
 #sit_ov_btn li {float:left;margin:0 0 0 1px}
-#sit_ov_btn a {display:inline-block;padding:10px 0 8px;width:80px;font-size:0.95em;text-align:center;text-decoration:none;letter-spacing:-0.1em}
+#sit_ov_btn a, #sit_ov_btn input {display:inline-block;padding:10px 0 8px;width:80px;border:0;font-size:0.95em;text-align:center;text-decoration:none;letter-spacing:-0.1em;cursor:pointer}
 #sit_btn_buy {background:#ff5b89;color:#fff}
 #sit_btn_cart, #sit_btn_wish {background:#555;color:#fff}
 #sit_btn_rec {background:#888;color:#fff}

extend/shop.extend2.php

@@ -480,8 +480,8 @@ if(!sql_query(" select od_cart_count from {$g4['shop_order_table']} limit 1 ", f
     sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
                     ADD `od_cart_count` int(11) NOT NULL DEFAULT '0' AFTER `od_memo`,
                     ADD `od_cart_price` int(11) NOT NULL DEFAULT '0' AFTER `od_cart_count`,
-                    ADD `od_cart_coupon` int(11) NOT NULL DEFAULT '0' AFTER `od_cart_amount`,
+                    ADD `od_cart_coupon` int(11) NOT NULL DEFAULT '0' AFTER `od_cart_price`,
-                    ADD `od_cancel_price` int(11) NOt NULL DEFAULT '0' AFTER `od_receipt_amount`,
+                    ADD `od_cancel_price` int(11) NOt NULL DEFAULT '0' AFTER `od_receipt_price`,
                     ADD `od_status` varchar(255) NOT NULL DEFAULT '' AFTER `od_mod_history` ", true);
 }
 

mobile/shop/mypage.php

@@ -8,13 +8,18 @@ $g4['title'] = '마이페이지';
 include_once(G4_MSHOP_PATH.'/_head.php');
 
 // 쿠폰
-$sql = " select count(*) as cnt
+$cp_count = 0;
+$sql = " select cp_id
             from {$g4['shop_coupon_table']}
             where mb_id = '{$member['mb_id']}'
-              and cp_used = '0'
               and cp_start <= '".G4_TIME_YMD."'
               and cp_end >= '".G4_TIME_YMD."' ";
-$cp = sql_fetch($sql);
+$res = sql_query($sql);
+
+for($k=0; $cp=sql_fetch_array($res); $k++) {
+    if(!is_used_coupon($member['mb_id'], $cp['cp_id']))
+        $cp_count++;
+}
 ?>
 
 <div id="smb_my">
@@ -26,7 +31,7 @@ $cp = sql_fetch($sql);
             <dt>보유포인트</dt>
             <dd><a href="<?php echo G4_BBS_URL; ?>/point.php" target="_blank" class="win_point"><?php echo number_format($member['mb_point']); ?>점</a></dd>
             <dt>보유쿠폰</dt>
-            <dd><a href="<?php echo G4_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp['cnt']); ?></a></dd>
+            <dd><a href="<?php echo G4_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp_count); ?></a></dd>
             <dt>연락처</dt>
             <dd><?php echo ($member['mb_tel'] ? $member['mb_tel'] : '미등록'); ?></dd>
             <dt>E-Mail</dt>

mobile/shop/orderformupdate.php

@@ -151,10 +151,9 @@ if($is_member) {
         $sql = " select cp_id, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum
                     from {$g4['shop_coupon_table']}
                     where cp_id = '{$_POST['od_cp_id']}'
-                      and mb_id = '{$member['mb_id']}'
+                      and mb_id IN ( '{$member['mb_id']}', '전체회원' )
                       and cp_start <= '".G4_TIME_YMD."'
                       and cp_end >= '".G4_TIME_YMD."'
-                      and cp_used = '0'
                       and cp_method = '2' ";
         $cp = sql_fetch($sql);
 
@@ -197,10 +196,9 @@ if($is_member && $send_cost > 0) {
         $sql = " select cp_id, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum
                     from {$g4['shop_coupon_table']}
                     where cp_id = '{$_POST['sc_cp_id']}'
-                      and mb_id = '{$member['mb_id']}'
+                      and mb_id IN ( '{$member['mb_id']}', '전체회원' )
                       and cp_start <= '".G4_TIME_YMD."'
                       and cp_end >= '".G4_TIME_YMD."'
-                      and cp_used = '0'
                       and cp_method = '3' ";
         $cp = sql_fetch($sql);
 

mobile/shop/orderinquiry.sub.php

@@ -37,7 +37,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         <a href="<?php echo G4_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a>
     </td>
     <td class="td_datetime"><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
-    <td class="td_bignum"><?php echo display_price($row['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']); ?></td>
+    <td class="td_bignum"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
     <td class="td_bignum"><?php echo display_price($row['couponprice']); ?></td>
     <td class="td_stat"><?php echo display_price($row['od_receipt_price']); ?></td>
 </tr>

shop/coupon.php

@@ -10,15 +10,10 @@ include_once(G4_PATH.'/head.sub.php');
 $sql = " select cp_id, cp_subject, cp_method, cp_target, cp_start, cp_end, cp_type, cp_price
             from {$g4['shop_coupon_table']}
             where mb_id = '{$member['mb_id']}'
-              and cp_used = '0'
               and cp_start <= '".G4_TIME_YMD."'
               and cp_end >= '".G4_TIME_YMD."'
             order by cp_no ";
 $result = sql_query($sql);
-
-$count = @mysql_num_rows($result);
-if(!$count)
-    alert_close('보유하신 쿠폰이 없습니다.');
 ?>
 
 <!-- 쿠폰 내역 시작 { -->
@@ -36,7 +31,11 @@ if(!$count)
     </thead>
     <tbody>
     <?php
+    $cp_count = 0;
     for($i=0; $row=sql_fetch_array($result); $i++) {
+        if(is_used_coupon($member['mb_id'], $row['cp_id']))
+            continue;
+
         if($row['cp_method'] == 1) {
             $sql = " select ca_name from {$g4['shop_category_table']} where ca_id = '{$row['cp_target']}' ";
             $ca = sql_fetch($sql);
@@ -55,6 +54,8 @@ if(!$count)
             $cp_price = $row['cp_price'].'%';
         else
             $cp_price = number_format($row['cp_price']).'원';
+
+        $cp_count++;
     ?>
     <tr>
         <td><?php echo $row['cp_subject']; ?></td>
@@ -64,6 +65,9 @@ if(!$count)
     </tr>
     <?php
     }
+
+    if(!$cp_count)
+        echo '<tr><td colspan="4" class="empty_table">사용할 수 있는 쿠폰이 없습니다.</td></tr>';
     ?>
     </tbody>
     </table>

shop/mypage.php

@@ -12,17 +12,19 @@ if (!$is_member)
 $g4['title'] = $member['mb_name'].'님 마이페이지';
 include_once('./_head.php');
 
-//$str = $g4[title];
-//include("./navigation2.inc.php");
-
 // 쿠폰
-$sql = " select count(*) as cnt
+$cp_count = 0;
+$sql = " select cp_id
             from {$g4['shop_coupon_table']}
             where mb_id = '{$member['mb_id']}'
-              and cp_used = '0'
               and cp_start <= '".G4_TIME_YMD."'
               and cp_end >= '".G4_TIME_YMD."' ";
-$cp = sql_fetch($sql);
+$res = sql_query($sql);
+
+for($k=0; $cp=sql_fetch_array($res); $k++) {
+    if(!is_used_coupon($member['mb_id'], $cp['cp_id']))
+        $cp_count++;
+}
 ?>
 
 <!-- 마이페이지 시작 { -->
@@ -45,7 +47,7 @@ $cp = sql_fetch($sql);
             <dt>보유포인트</dt>
             <dd><a href="<?php echo G4_BBS_URL; ?>/point.php" target="_blank" class="win_point"><?php echo number_format($member['mb_point']); ?>점</a></dd>
             <dt>보유쿠폰</dt>
-            <dd><a href="<?php echo G4_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp['cnt']); ?></a></dd>
+            <dd><a href="<?php echo G4_SHOP_URL; ?>/coupon.php" target="_blank" class="win_coupon"><?php echo number_format($cp_count); ?></a></dd>
             <dt>연락처</dt>
             <dd><?php echo ($member['mb_tel'] ? $member['mb_tel'] : '미등록'); ?></dd>
             <dt>E-Mail</dt>

shop/orderinquiry.sub.php

@@ -41,7 +41,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     </td>
     <td><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
     <td class="td_num"><?php echo $row['od_cart_count']; ?></td>
-    <td class="td_bignum"><?php echo display_price($row['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']); ?></td>
+    <td class="td_bignum"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
     <td class="td_bignum"><?php echo display_price($row['couponprice']); ?></td>
     <td class="td_bignum"><?php echo display_price($row['od_receipt_price']); ?></td>
     <td class="td_bignum"><?php echo display_price($row['od_misu']); ?></td>

skin/shop/basic/item.form.skin.php

@@ -251,8 +251,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             <?php if (!$it['it_tel_inq']) { ?>
             <li><input type="submit" onclick="document.pressed=this.value;" value="바로구매" id="sit_btn_buy"></li>
             <li><input type="submit" onclick="document.pressed=this.value;" value="장바구니" id="sit_btn_cart"></li>
-            <li><a href="javascript:fitemcheck(document.fitem, 'direct_buy');" id="sit_btn_buy">바로구매</a></li>
-            <li><a href="javascript:fitemcheck(document.fitem, 'cart_update');" id="sit_btn_cart">장바구니</a></li>
             <?php } ?>
 
             <li><a href="javascript:item_wish(document.fitem, '<?php echo $it['it_id']; ?>');" id="sit_btn_wish">위시리스트</a></li>