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

다음API 도로명 주소 적용

Browse Source
This commit is contained in:
chicpro
2014-08-18 14:28:05 +09:00
parent 29ab4185b4
commit 97d2f2bb85
16 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/orderdeliveryexcel.php
View File

@ -45,7 +45,7 @@ for($i=1; $row=sql_fetch_array($result); $i++) {
$worksheet->write($i, 4, $row['od_b_name']);
$worksheet->write($i, 5, $row['od_b_tel']);
$worksheet->write($i, 6, $row['od_b_hp']);
$worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']));
$worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']));
$worksheet->write($i, 8, $row['od_delivery_company']);
$worksheet->write($i, 9, $row['od_invoice']);
}

20
adm/shop_admin/orderform.php
View File

@ -97,6 +97,9 @@ if($od['od_pg'] == 'lg') {
echo '<script language="JavaScript" src="http://pgweb.uplus.co.kr/WEB_SERVER/js/receipt_link.js"></script>'.PHP_EOL;
}
}
$juso_addr_view = $od['od_addr_jibeon'] == 'N' ? 'style="display:none"' : '';
$juso_b_addr_view = $od['od_b_addr_jibeon'] == 'N' ? 'style="display:none"' : '';
?>
<section id="anc_sodr_list">
@ -829,11 +832,13 @@ if($od['od_pg'] == 'lg') {
<input type="text" name="od_addr1" value="<?php echo $od['od_addr1']; ?>" id="od_addr1" required class="frm_input required" size="35">
<label for="od_addr1">기본주소</label><br>
<input type="text" name="od_addr2" value="<?php echo $od['od_addr2']; ?>" id="od_addr2" class="frm_input" size="35">
<label for="od_addr2">상세주소</label><br>
<input type="text" name="od_addr3" value="<?php echo $od['od_addr3']; ?>" id="od_addr3" class="frm_input" size="35">
<label for="od_addr3">참고항목</label>
<label for="od_addr2">상세주소</label>
<span <?php echo $juso_addr_view; ?>>
<br>
<input type="text" name="od_addr3" value="<?php echo $od['od_addr3']; ?>" id="od_addr3" class="frm_input" size="35">
<label for="od_addr3">참고항목</label>
</span>
<input type="hidden" name="od_addr_jibeon" value="<?php echo $od['od_addr_jibeon']; ?>"><br>
<span id="od_addr_jibeon">지번주소 : <?php echo $od['od_addr_jibeon']; ?></span>
</tr>
<tr>
<th scope="row"><label for="od_email"><span class="sound_only">주문하신 분 </span>E-mail</label></th>
@ -884,10 +889,11 @@ if($od['od_pg'] == 'lg') {
<label for="od_b_addr1">기본주소</label>
<input type="text" name="od_b_addr2" value="<?php echo $od['od_b_addr2']; ?>" id="od_b_addr2" class="frm_input" size="35">
<label for="od_b_addr2">상세주소</label>
<input type="text" name="od_b_addr3" value="<?php echo $od['od_b_addr3']; ?>" id="od_b_addr3" class="frm_input" size="35">
<label for="od_b_addr3">참고항목</label>
<span <?php echo $juso_b_addr_view; ?>>
<input type="text" name="od_b_addr3" value="<?php echo $od['od_b_addr3']; ?>" id="od_b_addr3" class="frm_input" size="35">
<label for="od_b_addr3">참고항목</label>
</span>
<input type="hidden" name="od_b_addr_jibeon" value="<?php echo $od['od_b_addr_jibeon']; ?>"><br>
<span id="od_b_addr_jibeon">지번주소 : <?php echo $od['od_b_addr_jibeon']; ?></span>
</td>
</tr>

12
adm/shop_admin/orderprintresult.php
View File

@ -39,7 +39,7 @@ if ($csv == 'csv')
$to_date = date_conv($to_date);
$sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type
$sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type
FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b
where a.od_id = b.od_id ";
if ($case == 1) // 출력기간
@ -105,7 +105,7 @@ if ($csv == 'csv')
}
echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.',';
echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']).'"'.',';
echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']).'"'.',';
echo '"'.$row['od_b_name'].'"'.',';
//echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.',';
//echo '"'.multibyte_digit((string)$row[od_b_hp]).'"'.',';
@ -134,7 +134,7 @@ if ($csv == 'xls')
$fr_date = date_conv($fr_date);
$to_date = date_conv($to_date);
$sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type
$sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost, b.it_sc_type
FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b
where a.od_id = b.od_id ";
if ($case == 1) // 출력기간
@ -210,7 +210,7 @@ if ($csv == 'xls')
$row = array_map('iconv_euckr', $row);
$worksheet->write($i, 0, $row['od_b_zip1'].'-'.$row['od_b_zip2']);
$worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']));
$worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']));
$worksheet->write($i, 2, $row['od_b_name']);
$worksheet->write($i, 3, $row['od_b_tel']);
$worksheet->write($i, 4, $row['od_b_hp']);
@ -291,8 +291,8 @@ if (mysql_num_rows($result) == 0)
$row1 = sql_fetch($sql1);
// 1.03.02
$row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row['od_addr3']);
$row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row['od_b_addr3']);
$row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row1['od_addr3'], $row1['od_addr_jibeon']);
$row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row1['od_b_addr3'], $row1['od_b_addr_jibeon']);
$row1['od_addr'] = ($row1['od_addr']) ? $row1['od_addr'] : '입력안함';
$row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : '입력안함';