merge 충돌 수정

mobile/shop/orderform.php

@@ -276,13 +276,13 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
             <table>
             <tbody>
             <tr>
-                <th scope="row"><label for="od_name">이름</label></th>
+                <th scope="row"><label for="od_name">이름<strong class="sound_only"> 필수</strong></label></th>
                 <td><input type="text" name="od_name" value="<?php echo $member['mb_name']; ?>" id="od_name" required class="frm_input required" maxlength="20"></td>
             </tr>
 
             <?php if (!$is_member) { // 비회원이면 ?>
             <tr>
-                <th scope="row"><label for="od_pwd">비밀번호</label></th>
+                <th scope="row"><label for="od_pwd">비밀번호<strong class="sound_only"> 필수</strong></label></th>
                 <td>
                     <input type="password" name="od_pwd" id="od_pwd" required class="frm_input required" maxlength="20">
                     영,숫자 3~20자 (주문서 조회시 필요)
@@ -291,7 +291,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
             <?php } ?>
 
             <tr>
-                <th scope="row"><label for="od_tel">전화번호</label></th>
+                <th scope="row"><label for="od_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
                 <td><input type="text" name="od_tel" value="<?php echo $member['mb_tel']; ?>" id="od_tel" required class="frm_input required" maxlength="20"></td>
             </tr>
             <tr>
@@ -319,7 +319,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                 </td>
             </tr>
             <tr>
-                <th scope="row"><label for="od_email">E-mail</label></th>
+                <th scope="row"><label for="od_email">E-mail<strong class="sound_only"> 필수</strong></label></th>
                 <td><input type="email" name="od_email" value="<?php echo $member['mb_email']; ?>" id="od_email" required class="frm_input required" maxlength="100"></td>
             </tr>
 
@@ -416,11 +416,11 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
             }
             ?>
             <tr>
-                <th scope="row"><label for="od_b_name">이름</label></th>
+                <th scope="row"><label for="od_b_name">이름<strong class="sound_only"> 필수</strong></label></th>
                 <td><input type="text" name="od_b_name" id="od_b_name" required class="frm_input required" maxlength="20"></td>
             </tr>
             <tr>
-                <th scope="row"><label for="od_b_tel">전화번호</label></th>
+                <th scope="row"><label for="od_b_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
                 <td><input type="text" name="od_b_tel" id="od_b_tel" required class="frm_input required" maxlength="20"></td>
             </tr>
             <tr>

mobile/shop/orderinquiry.php

@@ -57,7 +57,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 ?>
 
 <div id="sod_v">
-    <p>주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p>
+    <p id="sod_v_info">주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p>
 
     <?php
     $limit = " limit $from_record, $rows ";

mobile/shop/personalpayresult.php

@@ -16,7 +16,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 
 <div id="sod_fin">
 
-    <p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
+    <p id="sod_fin_no">개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
 
     <section id="sod_fin_view">
         <h2>결제 정보</h2>
@@ -178,21 +178,39 @@ include_once(G5_MSHOP_PATH.'/_head.php');
     preg_match("/(\s[^\s]+\s)/", $pp['pp_bank_account'], $matchs);
     $deposit_no = trim($matchs[1]);
     ?>
-    <fieldset>
-    <legend>모의입금처리</legend>
     <p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
-    <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
-    <label for="e_trade_no">KCP 거래번호</label>
-    <input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>"><br />
-    <label for="deposit_no">입금계좌</label>
-    <input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>"><br />
-    <label for="req_name">입금자명</label>
-    <input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>"><br />
-    <label for="noti_url">입금통보 URL</label>
-    <input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php"><br /><br />
-    <input type="submit" value="입금통보 테스트">
-    </form>
-    </fieldset>
+    <div class="tbl_frm01 tbl_wrap">
+        <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
+        <table>
+        <caption>모의입금처리</caption>
+        <colgroup>
+            <col class="grid_3">
+            <col>
+        </colgroup>
+        <tbody>
+        <tr>
+            <th scope="col"><label for="e_trade_no">KCP 거래번호</label></th>
+            <td><input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>"></td>
+        </tr>
+        <tr>
+            <th scope="col"><label for="deposit_no">입금계좌</label></th>
+            <td><input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>"></td>
+        </tr>
+        <tr>
+            <th scope="col"><label for="req_name">입금자명</label></th>
+            <td><input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>"></td>
+        </tr>
+        <tr>
+            <th scope="col"><label for="noti_url">입금통보 URL</label></th>
+            <td><input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php"></td>
+        </tr>
+        </tbody>
+        </table>
+        <div id="sod_fin_test" class="btn_confirm">
+            <input type="submit" value="입금통보 테스트" class="btn_submit">
+        </div>
+        </form>
+    </div>
     <?php } ?>
 
 </div>

mobile/skin/shop/basic/personalpay.skin.php

@@ -17,17 +17,15 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
     }
 
     if ($i == 1) {
-        echo "<ul class=\"sct sct_10\">\n";
+        echo "<ul class=\"sct sct_pv\">\n";
     }
 
     $href = G5_SHOP_URL.'/personalpayform.php?pp_id='.$row['pp_id'].'&amp;page='.$page;
 ?>
-<li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px">
-        <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><img src="<?php echo G5_MSHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></span>
-            <b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b>
-            <span class="sct_cost"><?php echo display_price($row['pp_price']); ?></span>
-        </a>
+    <li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px">
+        <div class="sct_img"><a href="<?php echo $href; ?>" class="sct_a"><img src="<?php echo G5_MSHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></a></div>
+        <div class="sct_txt"><a href="<?php echo $href; ?>" class="sct_a"><?php echo get_text($row['pp_name']).'님 개인결제'; ?></a></div>
+        <div class="sct_cost"><?php echo display_price($row['pp_price']); ?></div>
     </li>
 <?php
 }

mobile/skin/shop/basic/style.css

@@ -45,6 +45,18 @@
 .scr_10 .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal}
 .scr_10 .sct_icon {margin:0 0 10px}
 .scr_10 .sct_sns {margin:15px 0 0}
+
+/* 개인결제 목록 */
+.sct_pv .sct_li {position:relative;float:left;padding:0 25px 15px 0}
+.sct_pv .sct_last {margin:0 0 15px !important}
+.sct_pv .sct_clear {clear:both}
+.sct_pv .sct_a {display:inline-block;position:relative;margin:0 0 5px;text-decoration:none}
+.sct_pv .sct_id {display:block;margin:0 0 5px}
+.sct_pv .sct_basic {margin:0 0 10px}
+.sct_pv .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
+.sct_pv .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal}
+.sct_pv .sct_icon {margin:0 0 10px}
+.sct_pv .sct_sns {margin:15px 0 0}
 /* ##### maint.(nn).skin.php, list.(nn).skin.php 공통 적용 끝 ##### */
 
 /* 상품 목록 */