Merge branch 'card007' into develop

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

@@ -135,9 +135,9 @@
 							</td>
 						</tr>
 						<tr>
-							<th>요청메모</th>
+							<th>요청메모<br/><span id="dpLocAnsContent">0</span>/1,000Byte</th>
 							<td colspan="5">
-								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
+								<textarea id="chgMemo" name="chgMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#dpLocAnsContent'));"></textarea>
 							</td>
 						</tr>
 					</tbody>

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

@@ -78,9 +78,9 @@
 							<td id="addDelvFee" colspan="3"></td>
 						</tr>
 						<tr>
-							<th>요청메모</th>
+							<th>요청메모<br/><span id="chgMemoCount">0</span>/1,000Byte</th>
 							<td colspan="5">
-								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="교환사유를 300자내외로 작성해 주세요"></textarea>
+								<textarea id="chgMemo" name="chgMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#chgMemoCount'));"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -130,9 +130,9 @@
 							</td>
 						</tr>
 						<tr>
-							<th>반품메모</th>
+							<th>반품메모<br/><span id="chgerRtnMemoCount">0</span>/1,000Byte</th>
 							<td colspan="3">
-								<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" placeholder="반품메모(수거시요청사항)를 300자내외로 작성해 주세요"></textarea>
+								<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#chgerRtnMemoCount'));"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -182,9 +182,9 @@
 						</td>
 					</tr>
 					<tr>
-						<th>배송메모</th>
+						<th>배송메모<br/><span id="delvMemoCount">0</span>/1,000Byte</th>
 						<td colspan="3">
-							<textarea id="delvMemo" name="delvMemo" style="height:80px;" placeholder="배송메모를 300자내외로 작성해 주세요"></textarea>
+							<textarea id="delvMemo" name="delvMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#delvMemoCount'));"></textarea>
 						</td>
 					</tr>
 					</tbody>
@@ -254,8 +254,8 @@ var columnExchangeReqList = [
 			{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 			{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center', hide: temp1},
 			{headerName: "주문상세상태"		, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center', hide: temp1},
-			{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-center', hide: temp1},
-			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center', hide: temp1},
+			{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-center'},
+			{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-center'},
 			{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center', hide: temp2}
 		]
 	},
@@ -263,14 +263,14 @@ var columnExchangeReqList = [
 		headerName	: "주문상세단품정보",
 		children	: [
 			{headerName: "단품번호"		, field: "ordDtlItemSq"		, width: 100	, cellClass: 'text-center', hide: temp2},
-			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center', hide: temp2},
-			{headerName: "단품명"			, field: "itemNm"			, width: 200	, cellClass: 'text-center', hide: temp2},
-			{headerName: "옵션1"			, field: "optCd1"			, width: 80		, cellClass: 'text-center', hide: temp1},
-			{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center', hide: temp2},
+			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center'},
+			{headerName: "단품명"			, field: "itemNm"			, width: 200	, cellClass: 'text-center'},
+			{headerName: "옵션1"			, field: "optCd1"			, width: 60		, cellClass: 'text-center'},
+			{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'},
 			{
 				headerName		: "단품수량"
 				, field			: "itemQty"
-				, width			: 80
+				, width			: 60
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -288,7 +288,7 @@ var columnExchangeReqList = [
 			{
 				headerName		: "단품옵션금액"
 				, field			: "optAddPrice"
-				, width			: 80
+				, width			: 90
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -302,7 +302,7 @@ var columnExchangeReqList = [
 			{
 				headerName		: "주문"
 				, field			: "ordQty"
-				, width			: 80
+				, width			: 70
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
@@ -311,7 +311,7 @@ var columnExchangeReqList = [
 			{
 				headerName		: "취소/요청"
 				, field			: "cnclRtnQty"
-				, width			: 80
+				, width			: 70
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
 					var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
@@ -585,6 +585,7 @@ var columnDelvCdList = [
 		, cellRenderer	: function (params) {
 			return params.value.addComma();
 		}
+		, hide			: true
 	},
 	{headerName: "반품지명"		, field: "rtnLocNm"			, width: 100	, cellClass: 'text-center'},
 	{headerName: "반품지전화번호"	, field: "rtnLocTelno"		, width: 100	, cellClass: 'text-center'},
@@ -703,20 +704,39 @@ var fnExchange = function () {
 	}
 
 	// 5. 회수지정보설정
+	var chgerNm			= "";
+	var chgerZipcode	= "";
+	var chgerBaseAddr	= "";
+	var chgerDtlAddr	= "";
+	
+	var chgerPhnno1		= "";
+	var chgerPhnno2		= "";
+	var chgerPhnno3		= "";
+	
+	var chgerTelno1		= "";
+	var chgerTelno2		= "";
+	var chgerTelno3		= "";
+	
+	var chgerPhnno 		= "";
+	var chgerTelno 		= "";
+	var chgerEmail 		= "";
+	var chgerRtnMemo	= "";
+
 	if (wdGb == 'W') {
-		var chgerNm			= $("#exchangeRequestFrm input[name=chgerNm]").val();
-		var chgerZipcode	= $("#exchangeRequestFrm input[name=chgerZipcode]").val();
-		var chgerBaseAddr	= $("#exchangeRequestFrm input[name=chgerBaseAddr]").val();
-		var chgerDtlAddr	= $("#exchangeRequestFrm input[name=chgerDtlAddr]").val();
+		chgerNm			= $("#exchangeRequestFrm input[name=chgerNm]").val();
+		chgerZipcode	= $("#exchangeRequestFrm input[name=chgerZipcode]").val();
+		chgerBaseAddr	= $("#exchangeRequestFrm input[name=chgerBaseAddr]").val();
+		chgerDtlAddr	= $("#exchangeRequestFrm input[name=chgerDtlAddr]").val();
 		
-		var chgerPhnno1		= $("#exchangeRequestFrm select[name=chgerPhnno1]").val();
-		var chgerPhnno2		= $("#exchangeRequestFrm input[name=chgerPhnno2]").val();
-		var chgerPhnno3		= $("#exchangeRequestFrm input[name=chgerPhnno3]").val();
+		chgerPhnno1		= $("#exchangeRequestFrm select[name=chgerPhnno1]").val();
+		chgerPhnno2		= $("#exchangeRequestFrm input[name=chgerPhnno2]").val();
+		chgerPhnno3		= $("#exchangeRequestFrm input[name=chgerPhnno3]").val();
 		
-		var chgerTelno1		= $("#exchangeRequestFrm select[name=chgerTelno1]").val();
-		var chgerTelno2		= $("#exchangeRequestFrm input[name=chgerTelno2]").val();
-		var chgerTelno3		= $("#exchangeRequestFrm input[name=chgerTelno3]").val();
-	
+		chgerTelno1		= $("#exchangeRequestFrm select[name=chgerTelno1]").val();
+		chgerTelno2		= $("#exchangeRequestFrm input[name=chgerTelno2]").val();
+		chgerTelno3		= $("#exchangeRequestFrm input[name=chgerTelno3]").val();
+
+		chgerRtnMemo	= $("#exchangeRequestFrm textarea[name=chgerRtnMemo]").val();
 		if (gagajf.isNull(chgerZipcode)) {
 			mcxDialog.alert("회수지주소를 입력하세요."); return;
 		}
@@ -737,9 +757,8 @@ var fnExchange = function () {
 			mcxDialog.alert("휴대전화를 입력하세요."); return;
 		}
 	
-		var chgerPhnno 		= chgerPhnno1 + '-' + chgerPhnno2 + '-' + chgerPhnno3;
-		var chgerEmail 		= orderInfoList[0].ordEmail;
-		var chgerTelno;
+		chgerPhnno 		= chgerPhnno1 + '-' + chgerPhnno2 + '-' + chgerPhnno3;
+		chgerEmail 		= orderInfoList[0].ordEmail;
 		if (gagajf.isNull(chgerTelno1) && gagajf.isNull(chgerTelno2) && gagajf.isNull(chgerTelno3)) {
 			chgerTelno 		= '';
 		} else {
@@ -808,7 +827,7 @@ var fnExchange = function () {
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
 		,"chgerTelno"		: chgerTelno
-		,"chgerRtnMemo"		: $("#exchangeRequestFrm textarea[name=chgerRtnMemo]").val()
+		,"chgerRtnMemo"		: chgerRtnMemo
 		,"recipNm"			: recipNm
 		,"recipEmail"		: recipEmail
 		,"recipZipcode"		: recipZipcode
@@ -987,7 +1006,7 @@ var fnChangeOption = function(param) {
 		}
 	});
 
-	gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
+	//gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 }
 
 // 교환수량 변경 이벤트
@@ -998,7 +1017,7 @@ var fnChangeQty = function(param) {
 
 	$.each(cancelRequestTargetList, function(idx, item){
 		if (item.ordDtlNo == ordDtlNo) {
-			if (gagajf.isNull(item.ordChgOpt)) {
+			if (gagajf.isNull(item.ordChgOpt) && chgQty > 0) {
 				mcxDialog.alert('교환옵션을 선택해주세요.');
 				return false;
 			}
@@ -1021,7 +1040,7 @@ var fnChangeQty = function(param) {
 	// 교환대상목록 설정
 	exchangeRequestList = exchangeRequestTargetList;
 
-	gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
+	//gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 }
 
 // 추가배송비 설정

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

@@ -782,8 +782,8 @@ var columnDefsOrderChangeInfo = [
 	},
 	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "옵션1"			, field: "colorNm"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션1"			, field: "colorNm"		, width: 100	, cellClass: 'text-center', hide : true},
+	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center', hide : true},
 	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
 	{
 		headerName		: "요청일자"		
@@ -798,7 +798,12 @@ var columnDefsOrderChangeInfo = [
 	{
 		headerName: "회수구분", field: "wdGb", width: 100, cellClass: 'text-center',
 		cellRenderer: function (params) {
-			return params.value == 'W' ? '회수요청' : '직접배송'; 
+			var rtnStr = "";
+			if (params.data.chgGb == 'G680_30' || params.data.chgGb == 'G680_40') {
+				rtnStr = params.value == 'W' ? '회수요청' : '직접배송';
+			}
+
+			return rtnStr;
 		}
 	},
 	{headerName: "요청메모"		, field: "chgMemo"		, width: 150	, cellClass: 'text-left'},

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

@@ -34,10 +34,15 @@
 
 				<h4 id="h4OrderCancelRequestToBeList">반품정보</h4>
 				<div id="gridOrderCancelRequestToBeList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
-				
-				<h4 id="h4DelvCdList">배송비정보</h4>
-				<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
-				
+
+				<div id="delvCdList">
+					<h4>배송정보</h4>
+					<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+				</div>
+
+				<h4 id="h4DelvInfoList">배송비정보</h4>
+				<div id="gridDelvInfoList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" id="rtnReqBtn" onclick="fnCnclReq('rtnReq');">반품신청</button>
 					<button type="button" class="btn btn-success" id="rtnReqCancelBtn" onclick="fnCnclReq('rtnReqCancel');">반품철회</button>
@@ -72,9 +77,9 @@
 							<td><span id="imputeReason"></span></td>
 						</tr>
 						<tr>
-							<th>요청메모</th>
+							<th>요청메모<br/><span id="chgMemoCount">0</span>/1,000Byte</th>
 							<td colspan="5">
-								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
+								<textarea id="chgMemo" name="chgMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#chgMemoCount'));"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -182,9 +187,9 @@
 								</td>
 							</tr>
 							<tr>
-								<th>반품메모</th>
+								<th>반품메모<br/><span id="chgerRtnMemoCount">0</span>/1,000Byte</th>
 								<td colspan="3">
-									<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" placeholder="반품메모(수거시요청사항)를 300자내외로 작성해 주세요"></textarea>
+									<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" onkeyup="cfnGetTextLength(this, 1000, $('#chgerRtnMemoCount'));"></textarea>
 								</td>
 							</tr>
 						</tbody>
@@ -756,7 +761,7 @@ var columnCancelReqToBeList = [
 var gridOptionsCancelReqToBeList = gagaAgGrid.getGridOptions(columnCancelReqToBeList);
 
 // 3. 배송비정보(환불정보)
-var columnDelvCdList = [
+var columnDelvInfoList = [
 	{
 		headerName	: "배송코드기준금액",
 		children	: [
@@ -859,6 +864,28 @@ var columnDelvCdList = [
 		]
 	}
 ];
+var gridOptionsDelvInfoList = gagaAgGrid.getGridOptions(columnDelvInfoList);
+
+// 3. 배송정보(환불정보)
+var columnDelvCdList = [
+	{headerName: "업체"			, field: "supplyCompNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "배송비코드"		, field: "delvFeeCd"		, width: 100	, cellClass: 'text-center'},
+	{
+		headerName		: "추가배송비"
+		, field			: "addDelvFee"
+		, width			: 100
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+		, hide			: true
+	},
+	{headerName: "반품지명"		, field: "rtnLocNm"			, width: 100	, cellClass: 'text-center'},
+	{headerName: "반품지전화번호"	, field: "rtnLocTelno"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "반품지우편번호"	, field: "rtnLocZipcode"	, width: 100	, cellClass: 'text-center'},
+	{headerName: "반품지기본주소"	, field: "rtnLocBaseAddr"	, width: 300	, cellClass: 'text-center'},
+	{headerName: "반품지상세주소"	, field: "rtnLocDtlAddr"	, width: 300	, cellClass: 'text-center'},
+];
 var gridOptionsDelvCdList = gagaAgGrid.getGridOptions(columnDelvCdList);
 </script>
 
@@ -944,7 +971,7 @@ var fnCalculateRefundAmt = function (obj) {
 			});
 			
 			gridOptionsCancelReqToBeList.api.setRowData(result.cancelOrderRefundList);
-			gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
+			gridOptionsDelvInfoList.api.setRowData(result.cancelDelvRefundList);
 			
 			let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
 			let sumDeliveryFee = result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
@@ -1342,8 +1369,10 @@ var fnChangeWdGb = function(param) {
 	// 회수지정보 히든 처리
 	if (wdGb == 'D') {
 		$('#chgerAddress').css('display', 'none');
+		$('#delvCdList').css('display', '');
 	} else {
 		$('#chgerAddress').css('display', '');
+		$('#delvCdList').css('display', 'none');
 	}
 	
 	// 환불예정금액 계산
@@ -1438,9 +1467,11 @@ $(document).ready(function() {
 	// 1. 그리드생성
 	gagaAgGrid.createGrid('gridOrderCancelRequestList'		, gridOptionsCancelReqList);			// 주문정보
 	gagaAgGrid.createGrid('gridOrderCancelRequestToBeList'	, gridOptionsCancelReqToBeList);		// 취소정보
-	gagaAgGrid.createGrid('gridDelvCdList'					, gridOptionsDelvCdList);				// 배송비정보
+	gagaAgGrid.createGrid('gridDelvInfoList'				, gridOptionsDelvInfoList);				// 배송비정보
+	gagaAgGrid.createGrid('gridDelvCdList'					, gridOptionsDelvCdList);				// 배송정보
 	
 	gridOptionsCancelReqList.api.setRowData(cancelRequestTargetList);
+	gridOptionsDelvCdList.api.setRowData(rtnLocInfo);
 	
 	// 1.1 TOTAL ROWS 없애기
 	gagaAgGrid.hideStatusBar('gridOrderCancelRequestList');
@@ -1452,6 +1483,7 @@ $(document).ready(function() {
 		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 	} else {
 		$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+		$('#delvCdList').css('display', 'none');
 	}
 	
 	// 3. 무통장입금아닐때 환불계좌 목록 숨김처리
@@ -1490,6 +1522,8 @@ $(document).ready(function() {
 		// 직접발송일때 회수지정보 숨김처리
 		if (wdGb == "D") {
 			$("#chgerAddress").css("display", "none");
+		} else {
+			$('#delvCdList').css('display', 'none');
 		}
 	} else {
 		$("#rtnReqCompleteBtn").css("display", "none");
@@ -1512,8 +1546,8 @@ $(document).ready(function() {
 	if (temp3) {
 		$("#h4OrderCancelRequestToBeList").css("display"	, "none");
 		$("#gridOrderCancelRequestToBeList").css("display"	, "none");
-		$("#h4DelvCdList").css("display"					, "none");
-		$("#gridDelvCdList").css("display"					, "none");
+		$("#h4DelvInfoList").css("display"					, "none");
+		$("#gridDelvInfoList").css("display"				, "none");
 	}
 	
 	// 7. 환불예상금액계산