Merge remote-tracking branch 'origin/develop' into card007

src/main/java/com/style24/persistence/domain/Coupon.java

@@ -1,6 +1,7 @@
 package com.style24.persistence.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
 import lombok.Data;
@@ -107,10 +108,18 @@ public class Coupon extends TscBaseDomain {
     List<CouponLimitedTime> limitedTimeCpnList; //선착순 쿠폰 리스트
     List<CouponAfChannel> afChannelList; //쿠폰 제휴채널 리스트
 
+    private String scmYn;
+
     // Pagination
     private TscPageRequest pageable;
     private int pageNo = 1;
     private int pageSize = 50;
     private int pageUnit = 10;
 
+    // 암호화 대상 복호화 처리
+    public String getCustNm() {
+        this.custNm = CryptoUtils.decryptAES(this.custNm);
+        return this.custNm;
+    }
+
 }

src/main/java/com/style24/persistence/domain/CouponBurden.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @Data
 public class CouponBurden extends TscBaseDomain {
     // TB_COUPON_REFVAL
-    private int  cpnId;					// 쿠폰ID
+    private Integer cpnId;					// 쿠폰ID
     private String  supplyCompCd;           // 공급업체코드
     private Integer burdenRate;             // 업체분담율
     private String  delYn;                  // 삭제여부

src/main/java/com/style24/persistence/domain/CouponLimitedTime.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 public class CouponLimitedTime extends TscBaseDomain {
     // TB_COUPON_REFVAL
-    private int     cpnId;				// 쿠폰ID
+    private Integer cpnId;				// 쿠폰ID
     private Integer limitCpnId;         // 선착순쿠폰일련번호
     private String  limitCpnNm;         // 선착순쿠폰명
     private int     downLimitQty;       // 다운로드가능수량

src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html

@@ -1365,6 +1365,7 @@
 					,limitedTimeCpnList : gagaAgGrid.getAllRowData(limitedTimeCpnGridOptions)
 					,afChannelList : gagaAgGrid.getAllRowData(afLinkOptions)
 					,mode : $('#CouponForm input[name=mode]').val()
+					,scmYn : 'N'
 				};
 				var jsonData = JSON.stringify(data);
 				gagajf.ajaxJsonSubmit($('#CouponForm').prop('action'), jsonData, fnCouponSaveCollback);

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

@@ -70,10 +70,15 @@ var columnDefs = [
 	{headerName: "미출고수량",			field:"cancelQty",			width:100, cellClass: 'text-center'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'
+		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
 		, cellEditorParams	: function(params){
-			var qtyList = new Array();
-			for(var i = 0 ; i <= params.data.ordQty ; i++) qtyList.push(i);
-			return {values: qtyList}
+			if(params.data.ordExchGb == "E") {
+				return {value : [0]};
+			} else {
+				var qtyList = new Array();
+				for(var i = 0 ; i <= params.data.ordQty ; i++) qtyList.push(i);
+				return {values: qtyList};
+			}
 		},
 		onCellValueChanged : function(params) {
 			if(params.data.cancelQty > -1) {

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

@@ -83,6 +83,7 @@
 							<select name="ordDtlStat" id="ordDtlStat">
 								<option value="G013_20" selected>결제완료</option>
 								<option value="G013_30">상품준비중</option>
+								<option value="G013_40">배송준비중</option>
 							</select>
 						</td>
 					</tr>
@@ -151,6 +152,7 @@ var columnDefs = [
 	{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},
 	{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
+	{headerName: "주문상세상태",		field:"ordDtlStat", 		width:100, cellClass: 'text-center', hide: true},
 	{headerName: "주문상세상태",		field:"ordDtlStatNm", 		width:100, cellClass: 'text-center'},
 	{headerName: "주문자명",			field:"ordNm",				width:100, cellClass: 'text-center'},
 	{headerName: "주문일시",			field:"ordDt",				width:100, cellClass: 'text-center',
@@ -176,6 +178,7 @@ var columnDefs = [
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'
+		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
 		, cellEditorParams	: {
 			values: gagaAgGrid.extractValues(shipCompanyList)
 		}
@@ -186,7 +189,8 @@ var columnDefs = [
 			return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
 		}
 	},
-	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left', editable : true}
+	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left', editable : true
+		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}	}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);