1. 주문 교환 임시 커밋

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -89,7 +89,7 @@
 						<tr>
 							<th>회수지주소 <i class="star"></i></th>
 							<td colspan="3">
-								<input type="text" name ="chgerZipNo" class="w100" readonly="readonly"/>
+								<input type="text" name ="chgerZipcode" class="w100" readonly="readonly"/>
 								<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 								<input type="text" name ="chgerBaseAddr" class="w300"/>
 								<input type="text" name ="chgerDtlAddr" class="w300"/>
@@ -115,6 +115,12 @@
 								- <input type="text" name ="chgerPhnno3" class="w60" value="0000" />
 							</td>
 						</tr>
+						<tr>
+							<th>반품메모</th>
+							<td colspan="3">
+								<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" placeholder="반품메모(수거시요청사항)를 300자내외로 작성해 주세요"></textarea>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 
@@ -134,7 +140,7 @@
 					<tr>
 						<th>교환지주소 <i class="star"></i></th>
 						<td colspan="3">
-							<input type="text" name ="recipZipNo" class="w100" readonly="readonly"/>
+							<input type="text" name ="recipZipcode" class="w100" readonly="readonly"/>
 							<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 							<input type="text" name ="recipBaseAddr" class="w300"/>
 							<input type="text" name ="recipDtlAddr" class="w300"/>
@@ -160,6 +166,12 @@
 							- <input type="text" name ="recipPhnno3" class="w60" value="0000" />
 						</td>
 					</tr>
+					<tr>
+						<th>배송메모</th>
+						<td colspan="3">
+							<textarea id="delvMemo" name="delvMemo" style="height:80px;" placeholder="배송메모를 300자내외로 작성해 주세요"></textarea>
+						</td>
+					</tr>
 					</tbody>
 				</table>
 			</form>
@@ -577,7 +589,7 @@ var fnExchange = function () {
 	// 5. 회수지정보설정
 	if (wdGb == 'W') {
 		var chgerNm			= $("#exchangeRequestFrm input[name=chgerNm]").val();
-		var chgerZipNo		= $("#exchangeRequestFrm input[name=chgerZipNo]").val();
+		var chgerZipcode	= $("#exchangeRequestFrm input[name=chgerZipcode]").val();
 		var chgerBaseAddr	= $("#exchangeRequestFrm input[name=chgerBaseAddr]").val();
 		var chgerDtlAddr	= $("#exchangeRequestFrm input[name=chgerDtlAddr]").val();
 		
@@ -589,7 +601,7 @@ var fnExchange = function () {
 		var chgerTelno2		= $("#exchangeRequestFrm input[name=chgerTelno2]").val();
 		var chgerTelno3		= $("#exchangeRequestFrm input[name=chgerTelno3]").val();
 	
-		if (gagajf.isNull(chgerZipNo)) {
+		if (gagajf.isNull(chgerZipcode)) {
 			mcxDialog.alert("회수지주소를 입력하세요."); return;
 		}
 		if (gagajf.isNull(chgerBaseAddr)) {
@@ -616,7 +628,7 @@ var fnExchange = function () {
 
 	// 교환지정보 설정
 	var recipNm			= $("#exchangeRequestFrm input[name=recipNm]").val();
-	var recipZipNo		= $("#exchangeRequestFrm input[name=recipZipNo]").val();
+	var recipZipcode	= $("#exchangeRequestFrm input[name=recipZipcode]").val();
 	var recipBaseAddr	= $("#exchangeRequestFrm input[name=recipBaseAddr]").val();
 	var recipDtlAddr	= $("#exchangeRequestFrm input[name=recipDtlAddr]").val();
 
@@ -628,7 +640,7 @@ var fnExchange = function () {
 	var recipTelno2		= $("#exchangeRequestFrm input[name=recipTelno2]").val();
 	var recipTelno3		= $("#exchangeRequestFrm input[name=recipTelno3]").val();
 	
-	if (gagajf.isNull(recipZipNo)) {
+	if (gagajf.isNull(recipZipcode)) {
 		mcxDialog.alert("교환지주소를 입력하세요."); return;
 	}
 	if (gagajf.isNull(recipBaseAddr)) {
@@ -662,14 +674,14 @@ var fnExchange = function () {
 		,"addPayCost"		: addDelvFee
 		,"chgerNm"			: chgerNm
 		,"chgerEmail"		: chgerEmail
-		,"chgerZipNo"		: chgerZipNo
+		,"chgerZipcode"		: chgerZipcode
 		,"chgerBaseAddr"	: chgerBaseAddr
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
 		,"chgerTelno"		: chgerTelno
 		,"recipNm"			: recipNm
 		,"recipEmail"		: recipEmail
-		,"recipZipNo"		: recipZipNo
+		,"recipZipcode"		: recipZipcode
 		,"recipBaseAddr"	: recipBaseAddr
 		,"recipDtlAddr"		: recipDtlAddr
 		,"recipPhnno"		: recipPhnno
@@ -702,11 +714,11 @@ var fnOpenDaumAddr = function(loc) {
 		oncomplete: function(data) {
 			// 우편번호와 주소 정보를 해당 필드에 넣는다.
 			if (loc == 'withdraw') {
-				$('#exchangeRequestFrm input[name=chgerZipNo]').val(data.zonecode);
+				$('#exchangeRequestFrm input[name=chgerZipcode]').val(data.zonecode);
 				$('#exchangeRequestFrm input[name=chgerBaseAddr]').val(cfnGetDaumRoadAddr(data));
 				$('#exchangeRequestFrm input[name=chgerDtlAddr]').focus();
 			} else if (loc == 'exchange') {
-				$('#exchangeRequestFrm input[name=recipZipNo]').val(data.zonecode);
+				$('#exchangeRequestFrm input[name=recipZipcode]').val(data.zonecode);
 				$('#exchangeRequestFrm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
 				$('#exchangeRequestFrm input[name=recipDtlAddr]').focus();
 			}
@@ -726,7 +738,7 @@ var fnSetChger = function(){
 	var spRecipTelno = (data.recipTelno != null) ? data.recipTelno.split('-') : null;
 	
 	$("#exchangeRequestFrm input[name=chgerNm]").val(data.recipNm);
-	$("#exchangeRequestFrm input[name=chgerZipNo]").val(data.recipZipNo);
+	$("#exchangeRequestFrm input[name=chgerZipcode]").val(data.recipZipcode);
 	$("#exchangeRequestFrm input[name=chgerBaseAddr]").val(data.recipBaseAddr);
 	$("#exchangeRequestFrm input[name=chgerDtlAddr]").val(data.recipDtlAddr);
 	
@@ -750,9 +762,10 @@ var fnSetExchangeAddr = function(){
 	var spRecipTelno = (data.recipTelno != null) ? data.recipTelno.split('-') : null;
 	
 	$("#exchangeRequestFrm input[name=recipNm]").val(data.recipNm);
-	$("#exchangeRequestFrm input[name=recipZipNo]").val(data.recipZipNo);
+	$("#exchangeRequestFrm input[name=recipZipcode]").val(data.recipZipcode);
 	$("#exchangeRequestFrm input[name=recipBaseAddr]").val(data.recipBaseAddr);
 	$("#exchangeRequestFrm input[name=recipDtlAddr]").val(data.recipDtlAddr);
+	$("#exchangeRequestFrm textarea[name=delvMemo]").val(data.delvMemo);
 	
 	if (spRecipPhnno) {
 		$("#exchangeRequestFrm select[name=recipPhnno1]").val(spRecipPhnno[0]);