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

2013-12-02 17:13:02 +09:00
parent 12db3fafb0 f06c17afce
commit 31f5d15664
5 changed files with 57 additions and 11 deletions
--- a/mobile/shop/orderinquiryview.php
+++ b/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>