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

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

@@ -383,6 +383,7 @@ public class TsaDisplayService {
 	@Transactional("shopTxnManager")
 	public void deleteDispOrdChangeGoods(CategoryGoods categoryGoods) {
 		GoodsCategory goodsCategory = new GoodsCategory();
+		goodsCategory.setBrandGroupNo(categoryGoods.getBrandGroupNo());
 		goodsCategory.setGoodsCd(categoryGoods.getGoodsCd());
 		goodsCategory.setCateNo(categoryGoods.getCateNo());
 		displayDao.deleteGoodsCategory(goodsCategory);

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

@@ -342,9 +342,7 @@ public class TsaPlanService {
 		}
 		
 		//기존 회원구분 삭제
-		for (int i = 0; i < param.getUsableCustGbArr().length; i++) {
-			planDao.deletePlanCustGb(param);
-		}
+		planDao.deletePlanCustGb(param);
 		
 		
 		// 기획전 회원구분 insert
@@ -357,9 +355,8 @@ public class TsaPlanService {
 		}
 		
 		//기존 회원등급 삭제
-		for (int i = 0; i < param.getUsableCustGradeArr().length; i++) {
-			planDao.deletePlanCustGrade(param);
-		}
+		planDao.deletePlanCustGrade(param);
+		
 		
 		// 기획전 회원등급 insert
 		String[] custGrade = param.getUsableCustGradeArr();
@@ -369,6 +366,7 @@ public class TsaPlanService {
 			plan.setRegNo(TsaSession.getInfo().getUserNo());
 			planDao.createPlanCustGrade(plan);
 		}
+		
 		int ind = 1;
 		if(param.getMainPimg() != null && !"".equals(param.getMainPimg())){
 			String imgInd = String.valueOf(ind);

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

@@ -91,16 +91,16 @@ public class TsaCommonController extends TsaBaseController {
 	@PostMapping("/file/upload")
 	@ResponseBody
 	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException {
-		log.info("policy111 ={}", policy);
 		if (StringUtils.isEmpty(policy)) {
 			policy = "default";
 		}
-		log.info("policy ={}", policy);
+
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload." + policy + ".target.path"), subDir);
-		log.info("targetPath ={}", targetPath);
+
 		GagaFileUploadUtil fuUtil = new GagaFileUploadUtil(targetPath, Long.parseLong(env.getProperty("upload." + policy + ".max.size")), env.getProperty("upload." + policy + ".allow.extension"), env.getProperty("upload." + policy + ".view"));
 
 		GagaUploadedFileInfo ufInfo = fuUtil.uploadFile(file);
+
 //		if (!"excel".equals(policy)) {
 //			// 운영서버에서만 FTP로 파일 업로드
 //			String profiles = env.getProperty("spring.profiles.active").toLowerCase();

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

@@ -21,5 +21,6 @@ public class DelvFeePolicy extends TscBaseDomain {
 	private int delvFee;			// 배송비
 	private int rtnDelvFee;			// 반품배송비
 	private String useYn;			// 사용여부
+	private String distributionGb;	// 유통구분
 
 }

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

@@ -348,7 +348,18 @@
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
-		WHERE  DELV_FEE_CD = #{delvFeeCd}
+		WHERE  1 = 1
+		<choose>
+		    <when test="distributionGb == 'G065_20'"> <!-- 입점-위탁 -->
+		AND    DELV_FEE_CD = #{delvFeeCd}
+		    </when>
+		    <otherwise>
+		AND    SUPPLY_COMP_CD IN (SELECT SUPPLY_COMP_CD
+		                          FROM   TB_SUPPLY_COMPANY
+		                          WHERE  DISTRIBUTION_GB != 'G065_20' /*자사*/
+		                         )
+		    </otherwise>
+		</choose>
 	</update>
 	
 	<!-- 출고처 목록 -->

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

@@ -827,10 +827,15 @@
 	<delete id="deleteGoodsCategory" parameterType="GoodsCategory">
 		/* TsaDisplay.deleteGoodsCategory */
 		DELETE
-		FROM 	TB_CATE_GOODS
-		WHERE 	1=1
-		AND		GOODS_CD = #{goodsCd}
-		AND 	CATE_NO = #{cateNo}
+		FROM TB_CATE_GOODS
+		WHERE 1=1
+		<if test="brandGroupNo != null and brandGroupNo > 0">
+		AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
+		AND CATE_NO = #{cateNo}
+		<if test="goodsCd != null and goodsCd != ''">
+		AND	GOODS_CD = #{goodsCd}
+		</if>
 	</delete>
 
 	<select id="getCategoryGoodsListCount" parameterType="CategoryGoods" resultType="int">
@@ -1115,18 +1120,22 @@
 		INSERT INTO TB_CATE_GOODS
 		(CATE_NO , GOODS_CD, DISP_ORD, REG_NO, REG_DT)
 		(
-			SELECT *
-			FROM 	(
-				SELECT	CATE_NO
-						 ,GOODS_CD
-						 ,@ROWNUM:=@ROWNUM+1 AS DISP_ORD
-						 ,REG_NO
-						 ,REG_DT
-				 FROM	TB_CATE_GOODS
-				WHERE	CATE_NO = #{cateNo}
-				  AND	(@ROWNUM:=0)=0
-				ORDER BY REG_DT
-			) B
+		    SELECT *
+		    FROM 	(
+		        SELECT	CATE_NO
+		               ,GOODS_CD
+		               ,@ROWNUM:=@ROWNUM+1 AS DISP_ORD
+		               ,REG_NO
+		               ,REG_DT
+		        FROM TB_CATE_GOODS
+		       WHERE 1=1
+		       AND CATE_NO = #{cateNo}
+		       <if test="brandGroupNo != null and brandGroupNo > 0">
+		       AND BRAND_GROUP_NO = #{brandGroupNo}
+		       </if>
+		         AND	(@ROWNUM:=0)=0
+		       ORDER BY REG_DT
+		    ) B
 		)
 		ON DUPLICATE KEY UPDATE
 		DISP_ORD = B.DISP_ORD

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

@@ -439,6 +439,13 @@
 		$('#detailForm input[name=bizDtlAddr]').val(event.data.bizDtlAddr);
 		$('#detailForm input[name=homepageUrl]').val(event.data.homepageUrl);
 		$('#detailForm select[name=distributionGb]').val(event.data.distributionGb);
+		
+		if (event.data.distributionGb == 'G065_20') { // 입점업체
+			$('#btnAddDelvFeePolicy').show();
+		} else { // 자사업체
+			$('#btnAddDelvFeePolicy').hide();
+		}
+		
 		$('#detailForm input[name=mainTelno]').val(event.data.mainTelno);
 		$('#detailForm input[name=mainFaxno]').val(event.data.mainFaxno);
 		$('#detailForm input[name=sellFeeRate]').val(event.data.sellFeeRate);
@@ -656,6 +663,7 @@
 					params.delvFee = $(this).find('input[name=delvFee]').val();
 					params.rtnDelvFee = $(this).find('select[name=rtnDelvFee]').val();
 					params.useYn = $(this).find('select[name=useYn]').val();
+					params.distributionGb = $('#detailForm select[name=distributionGb]').val();
 					arrData.push(params);
 				});
 				
@@ -690,10 +698,6 @@
 	$(document).ready(function() {
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);
-		
-		// Create a summernote
-		var snOptions = gagaSn.getToolbarOptions('media');
-		gagaSn.createSummernote(snOptions, '#note');
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/display/GoodsDispOrdChangePopupForm.html

@@ -27,7 +27,8 @@
 			<input type="hidden" id="searchGb" name="searchGb" value="BASIC"/>
 			<input type="hidden" id="cateCd" name="cateCd" th:value="${params.cateCd}"/>
 			<input type="hidden" id="contentsLoc" name="contentsLoc" th:value="${params.contentsLoc}"/>
-			<input type="hidden" id="brandGroupNo" name="brandGroupNo" th:value="${params.brandGroupNo}"/>
+			<input type="hidden" id="brandGroupNo" name="brandGroupNo" th:if="${params.brandGroupNo!=null}" th:value="${params.brandGroupNo}"/>
+			<input type="hidden" id="brandGroupNo" name="brandGroupNo" th:unless="${params.brandGroupNo!=null}" value="0"/>
 			<button type="button" class="btn btn-base btn-lg" id="btnSearch" style="display: none;">조회</button>
 			<div class="panelTitle">
 				<h2>상품 순서변경</h2>
@@ -37,7 +38,18 @@
 				<!-- 상단 영역 START -->
 				<ul class="lrStyle">
 					<li class="aL"><font color="#1e90ff">* 상품은 왼쪽에서 오른쪽 순서대로 전시 됩니다.</font></li>
-					<li class="aR">
+<!--					<li class="aR">-->
+<!--						<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnPopupAddGoods">상품추가</button>-->
+<!--						<button type="button" class="btn btn btn-info btn-sm" id="btnPopupReset">원 위치로</button>-->
+<!--						<button type="button" class="btn btn btn-info btn-sm" id="btnPopupInit">전시순서 초기화</button>-->
+<!--						<button type="button" class="btn btn btn-success btn-sm" id="btnPopupSave">저장</button>-->
+<!--					</li>-->
+				</ul>
+				<ul class="panelBar" style="margin-top: 10px;">
+					<li>
+						<button type="button" class="btn btn-danger btn-lg" onclick="fnAllGoodsDelete();">전체삭제</button>
+					</li>
+					<li class="right">
 						<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnPopupAddGoods">상품추가</button>
 						<button type="button" class="btn btn btn-info btn-sm" id="btnPopupReset">원 위치로</button>
 						<button type="button" class="btn btn btn-info btn-sm" id="btnPopupInit">전시순서 초기화</button>
@@ -102,9 +114,8 @@
 		if(typeof result.categoryGoodsList != 'undefined'){
 			resultList = result.categoryGoodsList;
 		}
-
+		var html = '';
 		if(resultList.length > 0){
-			var html = '';
 			for(var i=0; i<resultList.length; i++){
 				if(i==0){
 					firstOrd = resultList[i].dispOrd;
@@ -167,6 +178,8 @@
 				}
 			});
 			fnViewInit();
+		}else{
+			$("#sortable").html(html);
 		}
 		gagaPaging.createPagination(result.pageing.pageable);
 	}
@@ -227,6 +240,7 @@
 				var data = {
 					mode : 'delete'
 					,cateNo : $("#goodsDispOrdChangeForm input[name=cateCd]").val()
+					,brandGroupNo : $("#goodsDispOrdChangeForm input[name=brandGroupNo]").val()
 					,goodsCd : goodsCd
 				};
 
@@ -246,6 +260,7 @@
 			sureBtnClick: function(){
 				var data = {
 					cateNo : $("#goodsDispOrdChangeForm input[name=cateCd]").val()
+					,brandGroupNo : $("#goodsDispOrdChangeForm input[name=brandGroupNo]").val()
 				};
 
 				var jsonData = JSON.stringify(data);
@@ -254,6 +269,31 @@
 		});
 	});
 
+	/**
+	 * 상품 전체삭제
+	 */
+	var fnAllGoodsDelete = function (){
+		mcxDialog.confirm('전체 상품을 삭제하시겠습니까??', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				var data = {
+					mode : 'delete'
+					,cateNo : $("#goodsDispOrdChangeForm input[name=cateCd]").val()
+					,brandGroupNo : $("#goodsDispOrdChangeForm input[name=brandGroupNo]").val()
+				};
+
+				var jsonData = JSON.stringify(data);
+				gagajf.ajaxJsonSubmit('/display/goods/dispord/change/delete', jsonData, fnSearchData);
+			}
+		});
+	}
+
+	$("#btnAlldelete").on("click", function (){
+
+	});
+
+
 	/**
 	 * 최상단/하단 이동 버튼
 	 */

src/main/webapp/WEB-INF/views/display/LookbookBannerPopupForm.html

@@ -19,6 +19,7 @@
 		<form id="lbBannerForm" name="lbBannerForm" action="#" th:action="@{'/display/lookbook/save'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
 			<input type="hidden" id="siteCd" name="siteCd" value="G00_10"/>
 			<input type="hidden" id="lookbookSq" name="lookbookSq" th:value="${lookbookSq}"/>
+			<input type="hidden" name="mainDispYn" th:value="${lookbookMstInfo.mainDispYn}">
 			<input type="hidden" name="uploadDefaultBannerUrlPop" id="uploadDefaultBannerUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/lookbook/banner/'}"/>
 			<div class="panelTitle">
 				<h2 th:text="${'룩북 ' + (mode == 'N' ? '등록' : '상세')}"></h2>
@@ -229,7 +230,8 @@
 		var bannerIndex=0;
 		$(".bannerTableC").each(function (){
 			var bannerInfo = {
-				orgFileNm : $(this).find("input[name=bannerImgPath]").val()
+				 lookbookbSq:  $(this).find("input[name=lookbookbSq]").val()
+				,orgFileNm : $(this).find("input[name=bannerImgPath]").val()
 				,sysFileNm : $(this).find("input[name=bannerNewImgFile]").val()
 				,imgDesc : $(this).find("textarea[name=imgDesc]").val()
 				,dispOrd : $(this).find("input[name=dispOrd]").val()
@@ -253,7 +255,7 @@
 					,dispYn : $('#lbBannerForm input[name=dispYn]:checked').val()
 					,orgTnfileNm : orgTnfileNm
 					,newSysTnfileNm : newSysTnfileNm
-					,mainDispYn : 'N'
+					,mainDispYn : $('#lbBannerForm input[name=mainDispYn]').val()
 					,dispOrd : 1
 					,bannerList : bannerList
 					,mode : mode

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

@@ -134,7 +134,7 @@
 					<tr>
 					</tr>
 					<tr>
-						<th>사용고객등급구분<em class="required" title="필수"></em></th>
+						<th>사용고객등급구분</th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
 								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
@@ -529,7 +529,7 @@
 						
 					</tr>
 					<tr>
-						<th>사용고객등급구분<em class="required" title="필수"></em></th>
+						<th>사용고객등급구분</th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
 								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
@@ -1162,10 +1162,10 @@
 					var usableCustGradeArr = [];
 					var chkCustGrade = $('#planRegisterForm input:checkbox[name=usableCustGradeArr]:checked');
 					
-					if(chkCustGrade.length < 1){
+					/* if(chkCustGrade.length < 1){
 						mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 						return false;
-					}
+					} */
 					for(let i=0; i< chkCustGrade.length; i++){
 						usableCustGradeArr.push(chkCustGrade.eq(i).val());
 					}
@@ -1258,10 +1258,10 @@
 					var usableCustGradeArr = [];
 					var chkCustGrade = $('#planUpdateForm input:checkbox[name=usableCustGradeArr]:checked');
 					
-					if(chkCustGrade.length < 1){
+					/* if(chkCustGrade.length < 1){
 						mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 						return false;
-					}
+					} */
 					
 					for(let i=0; i< chkCustGrade.length; i++){
 						usableCustGradeArr.push(chkCustGrade.eq(i).val());

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

@@ -2130,12 +2130,12 @@
 	
 	
 $(document).ready(function() {
-		gagaSn.setContents('#fsrcPcBtm', ''); 
-		gagaSn.setContents('#fsrcMobileBtm', '');
-		gagaSn.setContents('#fsrcPcTop', ''); 
-		gagaSn.setContents('#fsrcMobileTop', '');
-		gagaSn.setContents('#note', '');
-/* 		var snOptions1 = gagaSn.getToolbarOptions('media');
+		//gagaSn.setContents('#fsrcPcBtm', ''); 
+		//gagaSn.setContents('#fsrcMobileBtm', '');
+		//gagaSn.setContents('#fsrcPcTop', ''); 
+		//gagaSn.setContents('#fsrcMobileTop', '');
+		//gagaSn.setContents('#note', '');
+ 		var snOptions1 = gagaSn.getToolbarOptions('media');
 		var snOptions2 = gagaSn.getToolbarOptions('media');
 		var snOptions3 = gagaSn.getToolbarOptions('media');
 		var snOptions4 = gagaSn.getToolbarOptions('media');
@@ -2144,7 +2144,7 @@ $(document).ready(function() {
 		gagaSn.createSummernote(snOptions1, '#fsrcPcTop');
 		gagaSn.createSummernote(snOptions2, '#fsrcMobileTop');
 		gagaSn.createSummernote(snOptions3, '#fsrcPcBtm');
-		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  */
+		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  
 		
 		// 그리드 그리기
 		gagaAgGrid.createGrid("gridListPlanReview", gridOptionsPlanReviewList);

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

@@ -268,8 +268,8 @@
 							<li class="right">
 								<button type="button" class="btn btn-default btn-lg" onclick="fnOpenGoodsPopup();">상품추가</button>
 								<button type="button" class="btn btn-default btn-lg" onclick="fnDeleteGoods();">상품삭제</button>
-								<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
-								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button> -->
+								<button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
+								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button>
 								<button type="button" class="btn btn-success btn-lg" onclick="fnSocialGoodsSave();">저장</button>
 							</li>
 						</ul>
@@ -342,10 +342,12 @@
 
 	// 바인딩
 	var fnBindDetail = function(data) {
-		fnSearchSocialGoodsList(data.socialSq);
+		fnFirstSearchSocialGoodsList(data.socialSq);
 		fnSetDate(data);
 	}
 	
+	
+	
 	// 데이터 설정
 	var fnSetDate = function(data) {
 		var formId = '#detailForm';
@@ -539,7 +541,8 @@
 		}, // 변경 후 할인율
 		/* {headerName: '적용 PC 포인트율'		, field:'pntAprate'	, width:200 , cellClass: 'text-right', editable : true, cellEditor: 'numericCellEditor'}, // 변경 후 포인트적립율(PC) */
 		/* {headerName: '적용 MOBILE 포인트율'	, field:'pntAmrate'	, width:200 , cellClass: 'text-right', editable : true, cellEditor: 'numericCellEditor' }, // 변경 후 포인트적립율(모바일) */
-		{headerName: '표시순서'				, field:'dispOrd'	, width:100 , cellClass: 'text-center', editable : true, cellEditor: 'numericCellEditor'},
+		/* {headerName: '표시순서'				, field:'dispOrd'	, width:100 , cellClass: 'text-center', editable : true, cellEditor: 'numericCellEditor', valueGetter: 'node.rowIndex+1'
+		}, */
 		{headerName: '삭제여부'				, field:'delYn'		, width:100 , cellClass: 'text-center', hide: true},
 		{headerName: '변경전 할인율'				, field:'dcBrate'		, width:100 , cellClass: 'text-center', hide: true},
 		{headerName: '기존 판매가'	         , field:'currBprice'		, width:100 , cellClass: 'text-center', hide: true},
@@ -557,14 +560,26 @@
 		params.socialSq = typeof socialSq == 'object' ? $('#detailForm input[name=socialSq]').val() : socialSq;
 		
 		var jsonData = JSON.stringify(params);
-		gagajf.ajaxJsonSubmit(actionUrl, jsonData, function(result) {
+			gagajf.ajaxJsonSubmit(actionUrl, jsonData, function(result) {
+			//gridOptionsGoods.api.setRowData(result);
+		});
+	}
+	
+	// 소셜 상품 목록 검색
+	var fnFirstSearchSocialGoodsList = function(socialSq) {
+		var actionUrl = 'marketing/social/goods/list';
+		var params = new Object();
+		params.socialSq = typeof socialSq == 'object' ? $('#detailForm input[name=socialSq]').val() : socialSq;
+		
+		var jsonData = JSON.stringify(params);
+			gagajf.ajaxJsonSubmit(actionUrl, jsonData, function(result) {
 			gridOptionsGoods.api.setRowData(result);
 		});
 	}
 	
 	// 적용가격 일괄적용
 	var fnPriceApply = function() {
-		var priceGb = $('#priceGb').val();
+		var priceGb = $('select[name=priceGb]').val();
 		var price = $('#price').val();
 		var msg = '';
 		
@@ -664,7 +679,9 @@
 							  currBprice: result[disp].currPrice,
 							  dcBrate: result[disp].dcRate,
 							  listPrice : result[disp].listPrice,
+							  dispOrd : disp+1
 							  };
+				
 				oldGoodsList.unshift(goods);
 				
 			}
@@ -687,6 +704,7 @@
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
+				gridOptionsGoods.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsGoods)});
 				$(selectedGoodsList).each(function(idx, goods) {
 					goods.delYn = 'Y';
 				});
@@ -697,7 +715,7 @@
 		});
 	}
 	
-	/* var fnSocialGoodsExcelUpload = function() {
+	var fnSocialGoodsExcelUpload = function() {
 		cfnExcelUploadPopup('socialGoodsExcelUpload', 'socialGoodsExcelUpload');
 	}
 	
@@ -710,7 +728,7 @@
 		
 		var jsonData = JSON.stringify(data);
 		gagajf.ajaxJsonSubmit('/marketing/social/goods/excelupload', jsonData, fnSearchSocialGoodsList);
-	} */
+	} 
 	
 	// 소셜 상품 저장
 	var fnSocialGoodsSave = function() {
@@ -736,10 +754,10 @@
 				msg = '상품코드 : ' + goods.goodsCd + '<br/>판매가와 할인율 모두 값이 존재하지않습니다.';
 				return false;
 			}
-			if (gagajf.isNull(goods.dispOrd)) {
+		/* 	if (gagajf.isNull(goods.dispOrd)) {
 				msg = '상품코드 : ' + goods.goodsCd + '<br/>전시순서를  입력해주세요.';
 				return false;
-			}
+			} */
 			
 			if(!gagajf.isNull(goods.currAprice)){
 				dcRate =  100 - Math.floor(Number(goods.currAprice) / Number(goods.listPrice) * 100);	//절사
@@ -749,7 +767,6 @@
 			}
 			else{
 				currAprice =   Number(goods.listPrice) - ( Number(goods.listPrice) * (Number(goods.dcArate)/100) );
-				console.log("여기들어왓어"+currAprice);
 				goods.currAprice = currAprice;
 			}
 			

src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -89,7 +89,7 @@ var gagaSn = {
 			callbacks: {
 				onImageUpload: function(files) { // 이미지 업로드
 					for (var i = 0; i < files.length; i++) {
-						uploadImage(files[i], this);
+						gagaSn.uploadImage(files[i], this);
 					}
 				},
 				onPaste: function(e) {
@@ -121,27 +121,24 @@ var gagaSn = {
 	uploadImage : function(file, editorId) {
 		var formData = new FormData();
 		formData.append("file", file);
-		formData.append("policy", image);
+		formData.append("policy", "image");
 		
 		$.ajax({
 			data : formData,
 			type : 'POST',
-			url : '/common/file/upload?subDir=/editor',
+			url : '/common/file/upload?subDir=/Upload/editor',
 			cache : false,
 			contentType : false,
 			enctype : 'multipart/form-data',
 			processData : false,
 			success : function(data) {
 				console.log("================== EDITOR FILE UPLOAD ===================");
-				console.log("viewUrl : " + data.viewUrl);
-				console.log("viewPath : " + data.viewPath);
-				console.log("oldFileNm : " + data.oldFileNm);
-				console.log("newFileNm : " + data.newFileNm);
-				console.log("filePath : " + data.filePath);
+				console.log(data);
 				console.log("================== // EDITOR FILE UPLOAD ===================");
-				$(editorId).summernote('insertImage', data.viewPath);
+				$(editorId).summernote('insertImage', data.viewUrl + "/Upload/editor/" + data.newFileName);
 			}
 		});
 	}
-
+	
 }
+