Merge branch 'sowon' into develop

src/main/webapp/WEB-INF/views/mob/planning/PlanningShotGuideFormMob.html

@@ -189,7 +189,7 @@ if(shotBrandList.length>0){
 			html += '							<div class="itemPic">';
 			html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 			html += '							</div>';
-			html += '							<p class="itemBrand">'+item2.brandGroupNm+'</p>';
+			html += '							<p class="itemBrand">'+item2.brandNm+'</p>';
 			html += '							<div class="itemName">'+item2.goodsNm+'</div>';
 			html += '							<p class="itemPrice">';
 			if (item2.currPrice != item2.listPrice) {
@@ -222,7 +222,13 @@ if(shotBrandList.length>0){
 				var iconGb = '';
 				var iconNm = '';
 				html += '	<p class="itemBadge">';
-				for(let i=0; i<iconArr.length; i++){
+				let arrCnt;
+				if (iconArr.length > 2) {
+					arrCnt = 3;
+				} else {
+					arrCnt = iconArr.length;
+				}
+				for(let i=0; i<arrCnt; i++){
 					var iconInfo = iconArr[i].split(":");
 					iconGb = iconInfo[0];
 					iconNm = iconInfo[1];

src/main/webapp/WEB-INF/views/web/planning/PlanningShotGuideFormWeb.html

@@ -189,7 +189,7 @@ if(shotBrandList.length>0){
 				html += '                             <div class="itemPic">';
 				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 				html += '                             </div>';
-				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
+				html += '                             <p class="itemBrand">'+item2.brandNm+'</p>';
 				html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
 				html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
 				if (item2.currPrice != item2.listPrice) {
@@ -221,7 +221,13 @@ if(shotBrandList.length>0){
 					var iconGb = '';
 					var iconNm = '';
 					html += '	<p class="itemBadge">';
-					for(let i=0; i<iconArr.length; i++){
+					let arrCnt;
+					if (iconArr.length > 2) {
+						arrCnt = 3;
+					} else {
+						arrCnt = iconArr.length;
+					}
+					for(let i=0; i<arrCnt; i++){
 						var iconInfo = iconArr[i].split(":");
 						iconGb = iconInfo[0];
 						iconNm = iconInfo[1];