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

lib/outlogin.lib.php

@@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit;
 // 외부로그인
 function outlogin($skin_dir='basic')
 {
-    global $config, $member, $g4, $urlencode, $is_admin, $is_member;
+    global $config, $default, $member, $g4, $urlencode, $is_admin, $is_member;
 
     if (array_key_exists('mb_nick', $member)) {
         $nick  = cut_str($member['mb_nick'], $config['cf_cut_name']);

shop/taxsave_kcp.php

@@ -232,7 +232,9 @@ $amt_tax = (int)($amt_tot - $amt_sup);
         </table>
 
         <div id="scash_apply">
-            <button type="button" onclick="jsf__pay_cash( this.form )">등록요청</button>
+            <span id="show_pay_btn">
+                <button type="button" onclick="jsf__pay_cash( this.form )">등록요청</button>
+            </span>
             <span id="show_progress" style="display:none">
                 <b>등록 진행중입니다. 잠시만 기다려주십시오</b>
             </span>

skin/outlogin/shop_basic/outlogin.skin.2.php

@@ -18,12 +18,21 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
                 <strong><?php echo $memo_not_read; ?></strong>
             </a>
         </li>
+        <?php if($default['de_mileage_use']) { ?>
+        <li>
+            <a href="<?php echo G4_SHOP_URL; ?>/mileage.php" target="_blank" id="ol_after_pt" class="win_point">
+                마일리지
+                <strong><?php echo number_format($member['mb_mileage']); ?></strong>
+            </a>
+        </li>
+        <?php } else { ?>
         <li>
             <a href="<?php echo G4_BBS_URL; ?>/point.php" target="_blank" id="ol_after_pt" class="win_point">
                 포인트
                 <strong><?php echo $point; ?></strong>
             </a>
         </li>
+        <?php } ?>
         <li>
             <a href="<?php echo G4_BBS_URL ?>/scrap.php" target="_blank" id="ol_after_scrap" class="win_scrap">스크랩</a>
         </li>