firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2014-04-04 17:58:48 +09:00
parent b291d21224 b5b90b8024
commit 48b6574ef5
17 changed files with 148 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/shop/orderform.php
View File

@ -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>