Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/web/TsaBusinessController.java

@@ -301,7 +301,7 @@ public class TsaBusinessController extends TsaBaseController {
 		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
 
 		// 구매적립포인트율
-		mav.addObject("pntInfo", cenvsetService.getEnvset(TscConstants.Site.STYLE24.value(), "C15"));
+		mav.addObject("pntInfo", cenvsetService.getEnvset(TscConstants.Site.STYLE24.value(), "C14"));
 
 		mav.setViewName("business/BrandForm");
 

src/main/resources/config/application-run.yml

@@ -27,46 +27,40 @@ spring:
 logging.config: classpath:log/logback-run.xml
 
 domain:
-    admin: //admin.wivismall.com
-    wivis: //www.wivismall.com
-    image: //image.wivismall.com/speedy_image-wivismall
-    uximage: //www.wivismall.com
+    admin: //bos.style24.com
+    style24: //www.style24.com
+    image: //image.istyle24.com
+    uximage: //bos.style24.com
 
 upload:
-    dext.target.path: /app/was/deploy/admin/data/dext
+    dext.target.path: /usr/local/data/style24/dext
     default:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.wivismall.com/speedy_image-wivismall
+        view: //image.istyle24.com
     goods:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/productimage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.wivismall.com/speedy_image-wivismall/goods
+        view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.wivismall.com/speedy_image-wivismall
+        view: //image.istyle24.com
     excel:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //admin.wivismall.com/data/excel
+        view: //image.istyle24.com/excel
     sample:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //admin.wivismall.com/data/sample
+        view: //image.style24.com/sample
 
-download.path: /app/was/deploy/admin/data
-
-# 사방넷 API
-sabangnet:
-    xml:
-        path: /app/was/deploy/api/data/sabangnet
-        url: http://api.wivismall.com/data/sabangnet
+download.path: /usr/local/data
 
 # SMTP
 mail:
@@ -85,7 +79,7 @@ mail:
 # PG
 pg:
     kcp:
-        log.dir: E:/Run/Payplus
+        log.dir: /logs/style24/kcpLogs/admin
         gw:
             url: paygw.kcp.co.kr
             port: 8090

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

@@ -453,7 +453,7 @@
 			selfYn = 'N';
 		}
 
-		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'S', $("#detailForm input[name=searchTxt]").val(), '' , selfYn);
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'M', $("#detailForm input[name=searchTxt]").val(), '' , selfYn);
 	});
 	
 	// 공급업체 조회 팝업에서 호출

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

@@ -183,7 +183,7 @@
 	gridOptionsBrandGroupList.onCellClicked = function(event) {
 		if (event.colDef.field != 'brandGroupNo')
 			return;
-		debugger;
+		
 		$("#brandGroupForm input[name=mode]").val("U");
 		$("#brandGroupForm input[name=brandGroupNo]").val(event.data.brandGroupNo);
 		$("#brandGroupForm input[name=brandGroupEnm]").val(event.data.brandGroupEnm);
@@ -346,7 +346,7 @@
 				return false;
 			}
 		}
-		debugger;
+		
 		// 이미지 체크
 		if (!gagajf.isNull($("#brandGroupForm input[name=logoFileNm]").val()) || !gagajf.isNull($("#brandGroupForm input[name=sysFileNm1]").val())){
 			if (gagajf.isNull($("#brandGroupForm input[name=bwLogoFileNm]").val()) && gagajf.isNull($("#brandGroupForm input[name=sysFileNm2]").val())){

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

@@ -15,14 +15,13 @@
  *******************************************************************************
  -->
 <div class="modalPopup" data-width="650" id="popupBrandList">
-	<div class="panelStyle">
+	<div class="panelStyle"  style="max-height:700px;overflow-y:scroll;">
 		<!-- TITLE -->
 		<div class="panelTitle">
 			<strong>브랜드 목록</strong>
 			<button type="button" class="close" onclick="uifnPopupClose('popupBrandList');"><em class="fa fa-times"></em></button>
 		</div>
 		<!-- //TITLE -->
-		
 		<!-- 검색 조건 -->
 		<div class="panelContent">
 			<form id="searchBrandListForm" name="searchBrandListForm" action="#" th:action="@{'/business/brand/list'}" onsubmit="$('#btnSearchBrandList').trigger('click'); return false;">
@@ -47,11 +46,11 @@
 						<tr>
 							<th>브랜드코드<i class="required" title="필수"></i></th>
 							<td>
-								<textarea class="textareaR3" name="searchBrandCd" id="searchBrandCd"></textarea>
+								<textarea class="textareaR2" name="searchBrandCd" id="searchBrandCd"></textarea>
 							</td>
 							<th>브랜드명<i class="required" title="필수"></i></th>
 							<td>
-								<textarea class="textareaR3" name="searchBrandNm" id="searchBrandNm"></textarea>
+								<textarea class="textareaR2" name="searchBrandNm" id="searchBrandNm"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -62,21 +61,20 @@
 					</li>
 				</ul>
 			</form>
+			<!-- 리스트 영역 -->
+			<div class="panelContent">
+				<div id="gridBrandList" style="width: 100%; height: 380px" class="ag-theme-balham"></div>
+			</div>
+			<!-- //리스트 영역 -->
+			
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-info btn-lg" id="btnConfirmBrand">확인</button>
+				</li>
+			</ul>
 		</div>
 		<!-- //검색 조건 -->
-		
-		<!-- 리스트 영역 -->
-		<div class="panelContent">
-			<div id="gridBrandList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
-		</div>
-		<!-- //리스트 영역 -->
-		
-		<!-- 버튼 배치 영역 -->
-		<ul class="panelBar">
-			<li class="right">
-				<button type="button" class="btn btn-info btn-lg" id="btnConfirmBrand">확인</button>
-			</li>
-		</ul>
 	</div>
 
 <script th:inline="javascript">
@@ -85,7 +83,7 @@
 	if([[${params.multiGb}]] == "M") headerSelection = true;
 	let columnDefsMdList = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: headerSelection, checkboxSelection: true, filter: false},
-		{headerName: "브랜드번호", field: "brandCd", width: 120, cellClass: 'text-center'},
+		{headerName: "브랜드번호", field: "brandCd", width: 100, cellClass: 'text-center'},
 		{headerName: "브랜드국문명", field: "brandEnm", width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드영문명", field: "brandKnm", width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드그룹명", field: "brandGroupNm", width: 150, cellClass: 'text-center'}

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

@@ -14,15 +14,14 @@
  * 1.0  2020.12.23   xodud1202   최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="500" id="popupCompanyList">
-	<div class="panelStyle">
+<div class="modalPopup" data-width="530" id="popupCompanyList">
+	<div class="panelStyle"  style="max-height:700px;overflow-y:scroll;">
 		<!-- TITLE -->
 		<div class="panelTitle">
 			<strong>공급업체 목록</strong>
 			<button type="button" class="close" onclick="uifnPopupClose('popupCompanyList');"><em class="fa fa-times"></em></button>
 		</div>
 		<!-- //TITLE -->
-
 		<!-- 검색 조건 -->
 		<div class="panelContent">
 			<form id="searchCompanyListForm" name="searchCompanyListForm" action="#" th:action="@{'/business/supply/company/list'}" onsubmit="$('#btnSearchCompanyList').trigger('click'); return false;">
@@ -48,11 +47,11 @@
 						<tr>
 							<th>업체코드<i class="required" title="필수"></i></th>
 							<td>
-								<textarea class="textareaR3" name="searchSupplyCompCd" id="searchSupplyCompCd"></textarea>
+								<textarea class="textareaR2" name="searchSupplyCompCd" id="searchSupplyCompCd"></textarea>
 							</td>
 							<th>업체명<i class="required" title="필수"></i></th>
 							<td>
-								<textarea class="textareaR3" name="searchSupplyCompNm" id="searchSupplyCompNm"></textarea>
+								<textarea class="textareaR2" name="searchSupplyCompNm" id="searchSupplyCompNm"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -63,23 +62,21 @@
 					</li>
 				</ul>
 			</form>
+			<!-- 리스트 영역 -->
+			<div class="panelContent">
+				<div id="gridComapanyPopupList" style="width: 100%; height: 380px" class="ag-theme-balham"></div>
+			</div>
+			<!-- //리스트 영역 -->
+	
+			<!-- 버튼 배치 영역 -->
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-info btn-lg" id="btnConfirmCompany">확인</button>
+				</li>
+			</ul>
 		</div>
 		<!-- //검색 조건 -->
-
-		<!-- 리스트 영역 -->
-		<div class="panelContent">
-			<div id="gridComapanyPopupList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
-		</div>
-		<!-- //리스트 영역 -->
-
-		<!-- 버튼 배치 영역 -->
-		<ul class="panelBar">
-			<li class="right">
-				<button type="button" class="btn btn-info btn-lg" id="btnConfirmCompany">확인</button>
-			</li>
-		</ul>
 	</div>
-
 	<script th:inline="javascript">
 		/*<![CDATA[*/
 		let headerSelection = false;

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

@@ -15,10 +15,10 @@
  *******************************************************************************
  -->
 <div class="modalPopup" data-width="1200" id="popupSupplyVendor">
-	<div class="panelStyle">
+	<div class="panelStyle" style="max-height:700px;overflow-y:scroll;">
 		<!-- TITLE -->
 		<div class="panelTitle">
-			<strong>쿠폰 조회</strong>
+			<strong>벤더 조회</strong>
 			<button type="button" class="close" onclick="uifnPopupClose('popupSupplyVendor');"><em class="fa fa-times"></em></button>
 		</div>
 		<!-- //TITLE -->

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -1069,7 +1069,10 @@
 			gagaSn.setContents('#goodsMobileTopDesc', result.goodsMobileTopDesc); 
 			gagaSn.setContents('#goodsPcDownDesc', result.goodsPcDownDesc); 
 			gagaSn.setContents('#goodsMobileDownDesc', result.goodsMobileDownDesc); 
-			gagaSn.setContents('#goodsDesc', result.goodsDesc);
+			
+			// asis html 변경
+			//gagaSn.setContents('#goodsDesc', result.goodsDesc);
+			gagaSn.setContents('#goodsDesc', result.goodsDesc.replaceAll('src="/Upload' , 'src="'+_imgUrl+'/Local'));
 
 			if (!gagajf.isNull(result.niClsfNm)){
 				$('#goodsDetailForm').find('#itemkindNoti').html('품목기준 고시분류 : ' + result.niClsfNm);

src/main/webapp/WEB-INF/views/goods/GoodsImageForm.html

@@ -176,7 +176,7 @@
 		}
 
 		// 업로드한 파일 및 순서 변경한 파일 설정
-		var totCnt = dx.getTotalItemCount();debugger;
+		var totCnt = dx.getTotalItemCount();
 		if (totCnt > 0) {
 			for (var i = 0; i < totCnt; i++) {
 				var item = dx.getItemByIndex(i);