Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/admin/biz/service/TsaShoplinkerService.java

@@ -905,6 +905,7 @@ public class TsaShoplinkerService {
 			String apiUrl = GagaShoplinkerConstants.API_DOMAIN + map.getApiSubUrl() + URLEncoder.encode(xmlUrl);
 
 			// API 호출결과
+		    shoplinkerUtil = new GagaShoplinkertUtil("MS949");
 			responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(apiUrl, "");
 
 			// response 결과

src/main/java/com/style24/persistence/mybatis/shop/TsaDelivery.xml

@@ -1377,14 +1377,7 @@
 		ON     OC.ORD_CHG_SQ = WD.ORD_CHG_SQ 
 		WHERE  1=1
 		AND    EDF.DEL_YN = 'N'
-		AND    NOT EXISTS (
-		    SELECT 1
-		    FROM   TB_ORDER_DETAIL X
-		    WHERE  1=1
-		    AND    X.ORD_NO = EDF.ORD_NO
-		    AND    X.ORD_DTL_NO = EDF.ORD_DTL_NO
-		    AND    X.ORD_DTL_STAT IN ('G013_99', 'G013_60', 'G013_50', 'G013_70')
-		)		
+			
 		<if test='ordNm != null and ordNm != ""'>
 		AND    O.ORD_NM = #{ordNm}
 		</if>

src/main/webapp/WEB-INF/views/business/Bizday2Form.html

@@ -98,7 +98,7 @@
 			eventLimit: true, // allow "more" link when too many events
 
 			select: function(arg) {
-				if ((new Date(arg.end)).format('YYYYMMDD') - (new Date(arg.start)).format('YYYYMMDD') > 1) return;
+				if ((new Date(arg.end).getTime() - new Date(arg.start).getTime()) / (1000*60*60*24) > 1)  return;
 				var title ='휴일';
 				
 				mcxDialog.confirm("휴일로 변경하시겠습니까?", {

src/main/webapp/WEB-INF/views/business/BizdayForm.html

@@ -97,8 +97,8 @@
 			editable: true,
 			eventLimit: true, // allow "more" link when too many events
 
-			select: function(arg) {
-				if ((new Date(arg.end)).format('YYYYMMDD') - (new Date(arg.start)).format('YYYYMMDD') > 1) return;
+			select: function(arg) {  
+				if ((new Date(arg.end).getTime() - new Date(arg.start).getTime()) / (1000*60*60*24) > 1) return;
 				var title ='휴일';
 				
 				mcxDialog.confirm("휴일로 변경하시겠습니까?", {

src/main/webapp/WEB-INF/views/delivery/ExchangeDelvFailListForm.html

@@ -186,8 +186,8 @@ var columnDefs = [
 		}
 	},
 	{headerName: "핸드폰번호",			field: "ordPhnno",				width: 120,	cellClass: 'text-center'},
-	{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 120,	cellClass: 'text-center', hide: true},
-	{headerName: "품절취소사유",		field: "delvFailReason",		width: 120,	cellClass: 'text-center', hide: true},
+	{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 120,	cellClass: 'text-center'},
+	{headerName: "품절취소사유",		field: "delvFailReason",		width: 120,	cellClass: 'text-center'},
 	{headerName: "상품타입",			field: "goodsTypeNm",			width: 130,	cellClass: 'text-center'},
 	{headerName: "상품코드",			field: "goodsCd",				width: 130,	cellClass: 'text-center'},
 	{headerName: "SKU-CODE",		field: "optCd",					width: 130,	cellClass: 'text-center'},