Merge branch 'develop' into bin2107

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

@@ -589,9 +589,10 @@
 		FROM	(
 			SELECT	@rownum := @rownum + 1 AS RNUM
 					,A.*
-					, CASE WHEN A.GOODS_TYPE = 'G056_S' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY), 0) - IFNULL(SUM(BASE_STOCK_QTY), 0) AS CURR_STOCK_QTY FROM VW_STOCK_COMPOSE WHERE GOODS_CD = A.GOODS_CD)
-					ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY), 0) - IFNULL(SUM(BASE_STOCK_QTY), 0) AS CURR_STOCK_QTY FROM VW_STOCK WHERE GOODS_CD = A.GOODS_CD)
-					END AS CURR_STOCK_QTY
+				--	, CASE WHEN A.GOODS_TYPE = 'G056_S' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY), 0) - IFNULL(SUM(BASE_STOCK_QTY), 0) AS CURR_STOCK_QTY FROM VW_STOCK_COMPOSE WHERE GOODS_CD = A.GOODS_CD)
+				--	ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY), 0) - IFNULL(SUM(BASE_STOCK_QTY), 0) AS CURR_STOCK_QTY FROM VW_STOCK WHERE GOODS_CD = A.GOODS_CD)
+				--	END AS CURR_STOCK_QTY
+					, IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = A.GOODS_CD),0) AS CURR_STOCK_QTY
 			FROM	(
 				SELECT	'카테고리확인' AS FULL_CATE_NM
 						, G.GOODS_CD

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

@@ -776,9 +776,10 @@
 	<select id="getPlanGoodsList" parameterType="Plan" resultType="Plan">
 		/* TsaPlan.getPlanGoodsList */
 		SELECT Q.*
-		    , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
-		            ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
-		            END) AS STOCK_QTY_SUM
+		   -- , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
+		   --         ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
+		   --         END) AS STOCK_QTY_SUM
+		    , IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = Q.GOODS_CD),0) AS STOCK_QTY_SUM
 		    , FN_GET_USER_NM(REG_NO) AS REG_NM
 		    , FN_GET_USER_NM(UPD_NO) AS UPD_NM
 		    , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = Q.GOODS_CD AND COLOR_CD = Q.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM

src/main/webapp/WEB-INF/views/customer/OneToOneQnaDetailForm.html

@@ -89,8 +89,8 @@
 							</td>
 							<th>첨부 이미지</th>
 							<td class="userImg">
-								<img th:if="${counselInfo.sysFileNm1 != null}" style="height: 100px;" th:src="${@environment.getProperty('domain.image') + '/counsel/' + counselInfo.sysFileNm1}" alt="" onerror='this.src="/image/no.png"'/>
-								<img th:if="${counselInfo.sysFileNm2 != null}" style="height: 100px;" th:src="${@environment.getProperty('domain.image') + '/counsel/' + counselInfo.sysFileNm2}" alt="" onerror='this.src="/image/no.png"'/>
+								<img th:if="${counselInfo.sysFileNm1 != null}" style="height: 100px;" th:src="${@environment.getProperty('domain.image') + '/' + counselInfo.sysFileNm1}" alt="" onerror='this.src="/image/no.png"'/>
+								<img th:if="${counselInfo.sysFileNm2 != null}" style="height: 100px;" th:src="${@environment.getProperty('domain.image') + '/' + counselInfo.sysFileNm2}" alt="" onerror='this.src="/image/no.png"'/>
 							</td>
 						</tr>
 					</tbody>

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

@@ -1027,6 +1027,22 @@
 				arr[idx] = item.basDays;
 			});
 			
+			var dupYn = false;
+			for(let i = 0; i < arr.length; i++) {
+			  const currElem = arr[i];
+			  for(let j = i+1; j < arr.length; j++) {
+			    if(currElem === arr[j]) {
+			      dupYn = true;
+			      break;
+			    }
+			  }
+			}
+			
+			if (dupYn == true) {
+				mcxDialog.alert('혜택적용 일수가 동일합니다.');
+				return;
+			}
+			
 			for(let i = 0; i < attendData.length; i++) {
 
 				if (attendData[i].benefitGb == 'A') {
@@ -1071,38 +1087,20 @@
 				}
 				
 				if (attendData[i].benefitGb == 'A' || attendData[i].benefitGb == 'C') {
-					data = {cpnId : attendData[i].cpnId};
-					var jsonData = JSON.stringify(data);
+					var param = {cpnId : attendData[i].cpnId};
+					var jsonData = JSON.stringify(param);
+					
 					gagajf.ajaxJsonSubmit('marketing/planning/attend/coupon', jsonData, function(result) {
 						if (result.length < 1) {
-							mcxDialog.alert('입력하신 쿠폰 아이디 ' + attendData[i].cpnId.addComma() + '은 유효하지 않습니다.');
-							flag = false;
-							return;
+							mcxDialog.alert('입력하신 쿠폰 ID ' + attendData[i].cpnId.addComma() + '은(는) 유효하지 않습니다.');
+							return false;
 						}
 					});
-					
-					if (flag == false) {
-						return;
-					}
 				}
 			};
 		}
 			
-		var dupYn = false;
-		for(let i = 0; i < arr.length; i++) {
-		  const currElem = arr[i];
-		  for(let j = i+1; j < arr.length; j++) {
-		    if(currElem === arr[j]) {
-		      dupYn = true;
-		      break;
-		    }
-		  }
-		}
-		
-		if (dupYn == true) {
-			mcxDialog.alert('혜택적용 일수가 동일합니다.');
-			return;
-		}
+	
 	 
 	 	gagajf.ajaxFormSubmit('/marketing/poll/list', formId, function(result) {
 				if (result.length < 1) {