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

adm/shop_admin/orderform.php

@@ -422,12 +422,12 @@ $result = sql_query($sql);
                 </tr>
                 <?php if ($od['od_invoice']) { ?>
                 <tr>
-                    <th scope="row">운송장번호</th>
+                    <th scope="row">배송회사</th>
-                    <td><?php echo $od['od_invoice']; ?></td>
+                    <td><?php echo $od['od_delivery_company']; ?> <?php echo get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice']); ?></td>
                 </tr>
                 <tr>
-                    <th scope="row">배송회사</th>
+                    <th scope="row">운송장번호</th>
-                    <td><?php echo $od['od_delivery_company']; ?></td>
+                    <td><?php echo $od['od_invoice']; ?></td>
                 </tr>
                 <?php } ?>
                 <tr>

lib/shop.lib.php

@@ -1994,6 +1994,35 @@ function shop_member_cert_check($id, $type)
 }
 
 
+// 배송조회버튼 생성
+function get_delivery_inquiry($company, $invoice, $class='')
+{
+    if(!$company || !$invoice)
+        return '';
+
+    $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY));
+
+    for($i=0; $i<count($dlcomp); $i++) {
+        if(strstr($dlcomp[$i], $company)) {
+            list($com, $url, $tel) = explode("^", $dlcomp[$i]);
+            break;
+        }
+    }
+
+    $str = '';
+    if($com && $url) {
+        $str .= '<a href="'.$url.$invoice.'" target="_blank"';
+        if($class)
+            $str .= ' class="'.$class.'"';
+        $str .='>배송조회</a>';
+        if($tel)
+            $str .= ' (문의전화: '.$tel.')';
+    }
+
+    return $str;
+}
+
+
 // 사용후기의 확인된 건수를 상품테이블에 저장합니다.
 function update_use_cnt($it_id)
 {

mobile/shop/orderinquiryview.php

@@ -470,7 +470,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                 ?>
                 <tr>
                     <th scope="row">배송회사</th>
-                    <td><?php echo $od['od_delivery_company']; ?></td>
+                    <td><?php echo $od['od_delivery_company']; ?> <?php echo get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice']); ?></td>
                 </tr>
                 <tr>
                     <th scope="row">운송장번호</th>

shop/orderinquiry.sub.php

@@ -15,15 +15,14 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
         <th scope="col">주문일시</th>
         <th scope="col">상품수</th>
         <th scope="col">주문금액</th>
-        <th scope="col">쿠폰</th>
         <th scope="col">입금액</th>
         <th scope="col">미입금액</th>
+        <th scope="col">상태</th>
     </tr>
     </thead>
     <tbody>
     <?php
-    $sql = " select *,
+    $sql = " select *
-                (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
                from {$g5['g5_shop_order_table']}
               where mb_id = '{$member['mb_id']}'
               order by od_id desc
@@ -32,6 +31,24 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
     for ($i=0; $row=sql_fetch_array($result); $i++)
     {
         $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
+
+        switch($row['od_status']) {
+            case '입금':
+                $od_status = '입금완료';
+                break;
+            case '준비':
+                $od_status = '상품준비중';
+                break;
+            case '배송':
+                $od_status = '상품배송';
+                break;
+            case '완료':
+                $od_status = '배송완료';
+                break;
+            default:
+                $od_status = '입금확인중';
+                break;
+        }
     ?>
 
     <tr>
@@ -39,12 +56,12 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
             <input type="hidden" name="ct_id[<?php echo $i; ?>]" value="<?php echo $row['ct_id']; ?>">
             <a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a>
         </td>
-        <td><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
+        <td><?php echo substr($row['od_time'],2,14); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
         <td class="td_num"><?php echo $row['od_cart_count']; ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
-        <td class="td_numbig"><?php echo display_price($row['couponprice']); ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_receipt_price']); ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_misu']); ?></td>
+        <td><?php echo $od_status; ?></td>
     </tr>
 
     <?php

shop/orderinquiryview.php

@@ -481,7 +481,7 @@ if(openwin != null) {
                 ?>
                 <tr>
                     <th scope="row">배송회사</th>
-                    <td><?php echo $od['od_delivery_company']; ?></td>
+                    <td><?php echo $od['od_delivery_company']; ?> <?php echo get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice']); ?></td>
                 </tr>
                 <tr>
                     <th scope="row">운송장번호</th>