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

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

@@ -279,6 +279,8 @@ public class TsaShoplinkerService {
 	private String setDetailDesc(ShoplinkerGoods shoplinkerGoods, ShoplinkerGoods goodsMap) {
 
 		String htmlDesc = "";
+		ShoplinkerGoods imgParam = new ShoplinkerGoods();	// shoplinkerGoods에 set하지 않도록 주의(미초기화 시 그다음 상품정보에 영향을 미침)
+		imgParam.setGoodsCd(shoplinkerGoods.getGoodsCd());
 
 		// 1. 기존 상세내용
 		String descStr = goodsMap.getDetailDesc();
@@ -301,8 +303,8 @@ public class TsaShoplinkerService {
 			String imgPath = env.getProperty("upload.goods.view");
 
 			// 메인컬러에 매칭되는 이미지만 가져옴.(상세,페브릭,라벨등..)
-			shoplinkerGoods.setExtmallDescImgYn("Y");
-			Collection<ShoplinkerGoods> imgList = admShoplinkerDao.getGoodsImageList(shoplinkerGoods);
+			imgParam.setExtmallDescImgYn("Y");
+			Collection<ShoplinkerGoods> imgList = admShoplinkerDao.getGoodsImageList(imgParam);
 
 			String dColor = goodsMap.getMainColorEnm(); //대표컬러
 			String dImgFront = "";	//대표상품 앞판컷
@@ -363,9 +365,9 @@ public class TsaShoplinkerService {
 
 				// 2) 상세내용 - 상품옵션별 색상
 				String colorDesc = "";
-				shoplinkerGoods.setExtmallDescImgYn("N");
-				shoplinkerGoods.setColorListYn("Y"); // 색상별 이미지 정보만 가져옴
-				Collection<ShoplinkerGoods> imgColorList = admShoplinkerDao.getGoodsImageList(shoplinkerGoods);
+				imgParam.setExtmallDescImgYn("N");
+				imgParam.setColorListYn("Y"); // 색상별 이미지 정보만 가져옴
+				Collection<ShoplinkerGoods> imgColorList = admShoplinkerDao.getGoodsImageList(imgParam);
 				colorDesc = "<div class=\"st_view_option_box\" style=\"margin-top: 100px;text-align: center; color:#222;\">";
 				String tmpColor = "";
 				for(ShoplinkerGoods ic : imgColorList ) {
@@ -745,8 +747,8 @@ public class TsaShoplinkerService {
 		try {
 
 			// 상품이미지정보
-			shoplinkerGoods.setExtmallImgYn("Y");
-			Collection<ShoplinkerGoods> list = admShoplinkerDao.getGoodsImageList(shoplinkerGoods);
+			regMap.setExtmallImgYn("Y");
+			Collection<ShoplinkerGoods> list = admShoplinkerDao.getGoodsImageList(regMap);
 
 			if(null != list && !list.isEmpty()) {
 

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

@@ -89,7 +89,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	@GetMapping("/cncl/req/form")
 	public ModelAndView cnclReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordDtlNo") int ordDtlNo
 			, @RequestParam(value = "delvFeeCd") String delvFeeCd, @RequestParam(value = "delvFeeCdGrp") String delvFeeCdGrp
-			, @RequestParam(value = "ordChgSq") int ordChgSq) {
+			, @RequestParam(value = "chgStat") String chgStat, @RequestParam(value = "ordChgSq") int ordChgSq) {
 
 		Order order = new Order();
 		order.setOrdNo(ordNo);
@@ -101,13 +101,25 @@ public class TsaOrderChangeController extends TsaBaseController {
 		String userId = TsaSession.getInfo().getUserId();
 
 		// 1. 취소가능 주문상세상탭값 설정
-		String[] ordDtlStatArr = new String[4];
-		ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
-		ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
-		ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
-		ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
-		order.setOrdDtlStatArr(ordDtlStatArr);
-		
+		if (TscConstants.OrderChangeStat.CANCEL.value().equals(chgStat)) {
+			String[] ordDtlStatArr = new String[5];
+			ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
+			ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
+			ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
+			ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
+			ordDtlStatArr[4] = TscConstants.OrderDetailStat.SHIPPING.value();
+			
+			order.setOrdDtlStatArr(ordDtlStatArr);
+		} else {
+			String[] ordDtlStatArr = new String[4];
+			ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
+			ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
+			ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
+			ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
+			
+			order.setOrdDtlStatArr(ordDtlStatArr);
+		}
+
 		// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트 
 		List<Order> cancelRequestTargetList 		= coreOrderChangeService.getCancelRequestTargetList2(order);
 		List<Order> orderChangeDetailList 			= coreOrderChangeService.getOrderChangeDetailList(order);
@@ -671,6 +683,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		if (isValid) {
 			// 2021.06.09 비회원이 아닌경우만 고객 계좌에 등록
 			if (order.getCustNo() > 0) {
+				// 환불계좌등록
 				coreOrderChangeService.saveRefundAccount(order);
 			}
 		} else {

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

@@ -975,7 +975,13 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       #{afLinkCd}
+		        (CASE WHEN #{mode} = 'N' THEN
+		                  (SELECT CONCAT('AL',IFNULL(LPAD(SUBSTRING(MAX(AF_LINK_CD),3) + 1,3,'0'),'000'))
+		                   FROM   TB_AF_LINK Z)
+		              ELSE
+		                  #{afLinkCd}
+		         END
+		        )
 		     , #{afLinkNm}
 		     , #{afChannel}
 		     , #{feeRate}

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

@@ -83,6 +83,8 @@
 					<!-- //버튼 배치 영역 -->
 					
 					<form id="detailForm" name="detailForm" action="#" th:action="@{'/business/aflink/save'}">
+						<input type="hidden" name="mode" value="N"/>
+						
 						<table class="frmStyle">
 							<colgroup>
 								<col style="width:30%"/>
@@ -91,7 +93,10 @@
 							<tr>
 								<th>제휴코드<i class="star"></i></th>
 								<td>
-									<input type="text" class="w100" name="afLinkCd" placeholder="" maxlength="5" required="required" data-valid-type="alphaNumeric" data-valid-name="제휴코드" onkeyup="$(this).val($(this).val().toUpperCase());"/>
+									<input type="text" class="w100" name="afLinkCd" placeholder="자동생성" maxlength="5" onkeyup="$(this).val($(this).val().toUpperCase());" readonly="readonly"/>
+									<span class="infoTxt cBlue">
+										<i class="fa fa-info-circle" aria-hidden="true"></i>AL+일련번호3자리로 자동생성
+									</span>
 								</td>
 							</tr>
 							<tr>
@@ -112,7 +117,7 @@
 							<tr>
 								<th>마진율<i class="star"></i></th>
 								<td>
-									<input type="text" class="w100 text-right" name="feeRate" placeholder="" maxlength="3" required="required" data-valid-type="real" data-valid-name="마진율" />%
+									<input type="text" class="w100 text-right" name="feeRate" placeholder="" maxlength="3" required="required" data-valid-type="preal" data-valid-name="마진율" />%
 								</td>
 							</tr>
 							<tr>
@@ -176,8 +181,9 @@
 		if (event.colDef.field != 'afLinkNm')
 			return;
 		
+		$('#detailForm input[name=mode]').val('U');
 		$('#detailForm input[name=afLinkCd]').val(event.data.afLinkCd);
-		$('#detailForm input[name=afLinkCd]').attr('readonly', true);
+// 		$('#detailForm input[name=afLinkCd]').attr('readonly', true);
 		$('#detailForm input[name=afLinkNm]').val(event.data.afLinkNm);
 		$('#detailForm select[name=afChannel]').val(event.data.afChannel);
 		$('#detailForm input[name=feeRate]').val(event.data.feeRate);
@@ -206,11 +212,12 @@
 	// 신규
 	$('#btnNew').on('click', function() {
 		$('#detailForm')[0].reset();
-		$('#detailForm input[name=afLinkCd]').attr('readonly', false);
-		$('#detailForm input[name=afLinkCd]').removeClass('formControl');
+		$('#detailForm input[name=mode]').val('N');
+// 		$('#detailForm input[name=afLinkCd]').attr('readonly', false);
+// 		$('#detailForm input[name=afLinkCd]').removeClass('formControl');
 		$('#detailForm input:checkbox[name=chkUseYn]').attr('disabled', true);
 		$('#detailForm input:checkbox[name=chkUseYn]').addClass('formControl');
-		$('#detailForm input[name=afLinkCd]').focus();
+		$('#detailForm input[name=afLinkNm]').focus();
 	});
 	
 	// 사용안함 버튼 클릭 시

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

@@ -360,7 +360,7 @@
 		} else { // 입점업체
 			if (mode == 'N') {
 				$('#detailForm input[name=delvLocCd]').attr('readonly', true); // 직접입력 불가
-				$('#detailForm input[name=delvLocCd]').val('');
+				$('#detailForm input[name=delvLocCd]').val('AUTO');
 				$('#detailForm input[name=delvLocCd]').attr('placeholder', '자동생성');
 			}
 		

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

@@ -325,6 +325,13 @@
 				dupCnt++;
 				return false;
 			}
+			$("#tabTable"+thisIdx+" #tabBrand1 #brandListTd1").find('ul').find('input[name=imgPath1]').each(function (j){
+				if(gagajf.isNull($(this).val()) || $(this).val() == "null"){
+					mcxDialog.alert((i+1)+"번째 컨텐츠영역 GROUP1의 "+(j+1)+"번째 브랜드 이미지 정보가 없습니다.");
+					dupCnt++;
+					return false;
+				}
+			});
 
 			if($("#tabTable"+thisIdx+" #tabBrand2 #brandListTd2").find('ul').find('input[name=brandGroupNo]').length < 1){
 				mcxDialog.alert((i+1)+"번째 컨텐츠영역의 2번째 브랜드 정보가 없습니다.");
@@ -332,6 +339,13 @@
 				dupCnt++;
 				return false;
 			}
+			$("#tabTable"+thisIdx+" #tabBrand2 #brandListTd2").find('ul').find('input[name=imgPath1]').each(function (k){
+				if(gagajf.isNull($(this).val()) || $(this).val() == "null"){
+					mcxDialog.alert((i+1)+"번째 컨텐츠영역 GROUP2의 "+(k+1)+"번째 브랜드 이미지 정보가 없습니다.");
+					dupCnt++;
+					return false;
+				}
+			});
 
 			if($("#tabTable"+thisIdx+" #tabBrand3 #brandListTd3").find('ul').find('input[name=brandGroupNo]').length < 1){
 				mcxDialog.alert((i+1)+"번째 컨텐츠영역의 3번째 브랜드 정보가 없습니다.");
@@ -339,6 +353,13 @@
 				dupCnt++;
 				return false;
 			}
+			$("#tabTable"+thisIdx+" #tabBrand3 #brandListTd3").find('ul').find('input[name=imgPath1]').each(function (m){
+				if(gagajf.isNull($(this).val()) || $(this).val() == "null"){
+					mcxDialog.alert((i+1)+"번째 컨텐츠영역 GROUP3의 "+(m+1)+"번째 브랜드 이미지 정보가 없습니다.");
+					dupCnt++;
+					return false;
+				}
+			});
 		});
 
 		// if(!dataBool){
@@ -670,6 +691,9 @@
 			for(let k=0; k<g1cdArr.length; k++){
 				html += '<ul id="brandUl' + k + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g1cdArr[k] + '">';
+				if(!gagajf.isNull(g1imgArr)){
+					html += '	<input type="hidden" name="imgPath1" value="' + g1imgArr[k] + '">';
+				}
 				html += '	<li class="img">';
 				if(gagajf.isNull(g1imgArr)){
 					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';
@@ -701,6 +725,9 @@
 			for(let m=0; m<g2cdArr.length; m++){
 				html += '<ul id="brandUl' + m + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g2cdArr[m] + '">';
+				if(!gagajf.isNull(g2imgArr)){
+					html += '	<input type="hidden" name="imgPath1" value="' + g2imgArr[m] + '">';
+				}
 				html += '	<li class="img">';
 				if(gagajf.isNull(g2imgArr)){
 					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';
@@ -732,6 +759,9 @@
 			for(let n=0; n<g3cdArr.length; n++){
 				html += '<ul id="brandUl' + n + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g3cdArr[n] + '">';
+				if(!gagajf.isNull(g3imgArr)){
+					html += '	<input type="hidden" name="imgPath1" value="' + g3imgArr[n] + '">';
+				}
 				html += '	<li class="img">';
 				if(gagajf.isNull(g3imgArr)){
 					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';

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

@@ -207,7 +207,7 @@
 											<div><i class="fa fa-info-circle"></i> 사은품은 최대 <font color="red">5</font>개까지 설정하실 수 있습니다.</div>
 											<div><i class="fa fa-info-circle"></i> 구매 금액 조건을 추가하시면 구매 금액 충족 조건에 맞는 것으로 지급됩니다. 구매금액 조건은 최대 2개까지만등록 하실 수 있습니다.</div>
 											<div><i class="fa fa-info-circle"></i> 장바구니에 담았을 때의 가격 기준으로 적용됩니다.(주문상품쿠폰(다운로드쿠폰)/장바구니 쿠폰 할인 적용 전 판매가)</div>
-											<label for="saleAmt">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt" name="sectionVal" data-valid-type="numeric"/> <br/>
+											<label for="saleAmt">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt" name="sectionVal" data-valid-type="pinteger"/> <br/>
 											<span>사은품 목록</span>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnAddFreeGoods1">+ 사은품 선택</button>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnDeleteFreeGoods1">선택삭제</button>
@@ -220,7 +220,7 @@
 									<th>사은품 조건2<br/>(최대 2개)</th>
 									<td>
 										<div>
-											<label for="saleAmt2">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt2"  name="sectionVal2" data-valid-type="numeric"/> <br/>
+											<label for="saleAmt2">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt2"  name="sectionVal2" data-valid-type="pinteger"/> <br/>
 											<span>사은품 목록</span>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnAddFreeGoods2">+ 사은품 선택</button>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnDeleteFreeGoods2">선택삭제</button>
@@ -555,6 +555,21 @@
 				$("#freeGoodsPromotionForm #btnFreegoodsPromotionSave").show();		// 저장
 				$("#freeGoodsPromotionForm #btnChangeStatIng").show();				// 진행
 				$("#freeGoodsPromotionForm #btnPromotionDelete").show();			// 삭제
+
+				//gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods1List.columnApi.getColumn("itemQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods1List.columnApi.getColumn("limitQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				//gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods2List.columnApi.getColumn("itemQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods2List.columnApi.getColumn("limitQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+
+				if(freegift.allYn == "Y") {
+					gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+					gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+				} else {
+					gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+					gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				}
 			} else {
 				// 대기 상태일 경우를 제외하면 모든 상태 수정 불가(기획서대로 진행 상태에서 일부 수정 가능할 경우 if문 주석 제거)
 				//if(freegift.freegiftStat == "G232_11") {
@@ -632,6 +647,13 @@
 			$('#freeGoodsPromotionForm #freegiftEdHH option:last').prop("selected", true);
 			$("#freeGoodsPromotionForm #freegiftEdMM option").hide();
 			$('#freeGoodsPromotionForm #freegiftEdMM option:first').show().prop("selected", true);
+
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods1List.columnApi.getColumn("itemQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("limitQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("itemQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("limitQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
 		} else {
 			fnFreegiftSearch();
 		}
@@ -942,6 +964,38 @@
 		}
 	});
 
+	// 지급 방법 변경
+	$("#freeGoodsPromotionForm input[name=allYn]").on('change', function () {
+		if($(this).val() == "Y") {
+			// 등록된 포인트액 0원으로 수정
+			let goods1List = gagaAgGrid.getAllRowData(gridOptionsFreeGoods1List);
+			let goods2List = gagaAgGrid.getAllRowData(gridOptionsFreeGoods2List);
+
+			for(var z = 0 ; z < goods1List.length ; z++) {goods1List[z].usePoint = 0};
+			for(var z = 0 ; z < goods2List.length ; z++) {goods2List[z].usePoint = 0};
+
+			// 포인트액 수정 불가 및 수정가능 색상 제거
+			console.log(gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle);
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: 'clear'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: 'clear'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+
+			gridOptionsFreeGoods1List.api.setRowData(goods1List);
+			gridOptionsFreeGoods2List.api.setRowData(goods2List);
+		} else {
+			console.log(gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle);
+			// 포인트액 수정 가능 및 수정가능 색상으로 변경
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = true;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = true;
+
+			gridOptionsFreeGoods1List.api.setRowData(gagaAgGrid.getAllRowData(gridOptionsFreeGoods1List));
+			gridOptionsFreeGoods2List.api.setRowData(gagaAgGrid.getAllRowData(gridOptionsFreeGoods2List));
+		}
+	});
+
 	// 목록 버튼 클릭
 	$("#freeGoodsPromotionForm #btnSearchList").on("click", function() {
 		uifnPopupClose('popupFreeGoodsPromotionRegi');

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -1232,7 +1232,6 @@ $(document).ready(function() {
 		$('.chger').css('display', 'none');
 		$('input:radio[name=wdGb]').attr('disabled', true);
 	} else {
-		alert(wdGb);
 		if (wdGb == 'D') {
 			$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 			$('.chger').css('display', 'none');

src/main/webapp/WEB-INF/views/order/OrderDetailCouponHst.html

@@ -44,7 +44,7 @@ var columnDefsOrderCouponInfo = [
 		headerName			: "웹 할인금액/율"
 		, field				: "dcPval"
 		, width				: 120
-		, cellClass			: 'text-center'
+		, cellClass			: 'text-right'
 		, valueFormatter	: function(params) {
 			return (params.data.dcWay == 'G240_10') ? params.value.addComma() + '원' : params.value.addComma() + '%';}	
 	},
@@ -52,7 +52,7 @@ var columnDefsOrderCouponInfo = [
 		headerName			: "모바일 할인금액/율"
 		, field				: "dcMval"
 		, width				: 120
-		, cellClass			: 'text-center'
+		, cellClass			: 'text-right'
 		, valueFormatter	: function(params) {
 			return (params.data.dcWay == 'G240_10') ? params.value.addComma() + '원' : params.value.addComma() + '%';
 		}	
@@ -61,7 +61,7 @@ var columnDefsOrderCouponInfo = [
 		headerName			: "판매상품가격"
 		, field				: "ordAmt"
 		, width				: 100
-		, cellClass			: 'text-center'
+		, cellClass			: 'text-right'
 		, valueFormatter	: function(params) {
 			return params.value.addComma();
 		}	
@@ -70,7 +70,7 @@ var columnDefsOrderCouponInfo = [
 		headerName			: "실할인금액"
 		, field				: "cpnDcAmt"
 		, width				: 100
-		, cellClass			: 'text-center'
+		, cellClass			: 'text-right'
 		, valueFormatter	: function(params) {
 			return params.value.addComma();
 		}	

src/main/webapp/WEB-INF/views/order/OrderDetailGiftcardHst.html

@@ -41,7 +41,7 @@ var columnDefsOrderGiftcardInfo = [
 			headerName			: "상품권승인금액"
 			, field				: "chgGfcdAmt"
 			, width				: 130
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	
@@ -50,7 +50,7 @@ var columnDefsOrderGiftcardInfo = [
 			headerName			: "상품권사용금액"
 			, field				: "usGfcdAmt"
 			, width				: 130
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	
@@ -59,7 +59,7 @@ var columnDefsOrderGiftcardInfo = [
 			headerName			: "상품권남은금액"
 			, field				: "rmGfcdAmt"
 			, width				: 130
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	
@@ -70,7 +70,7 @@ var columnDefsOrderGiftcardInfo = [
 			headerName			: "상품권사용금액"
 			, field				: "gfcdAmt"
 			, width				: 130
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	

src/main/webapp/WEB-INF/views/order/OrderDetailPointHst.html

@@ -35,14 +35,14 @@ var orderPointHstList = [[${orderPointHstList}]];
 
 // specify the columns
 var columnDefsOrderPointInfo = [
-		{headerName: "상품코드", 		field: "goodsCd", 		width: 100, cellClass: 'text-center'},
-		{headerName: "적립율(PC)", 	field: "pntPrate", 		width: 100, cellClass: 'text-center'},
+		{headerName: "상품코드", 			field: "goodsCd", 		width: 100, cellClass: 'text-center'},
+		{headerName: "적립율(PC)", 		field: "pntPrate", 		width: 100, cellClass: 'text-center'},
 		{headerName: "적립율(모바일)", 	field: "pntMrate", 		width: 100, cellClass: 'text-center'},
 		{
 			headerName			: "판매상품가격"
 			, field				: "currPrice"
 			, width				: 120
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	
@@ -51,7 +51,7 @@ var columnDefsOrderPointInfo = [
 			headerName			: "실결제상품가격"
 			, field				: "realOrdAmt"
 			, width				: 140
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	
@@ -60,7 +60,7 @@ var columnDefsOrderPointInfo = [
 			headerName			: "사용포인트"
 			, field				: "pntAmt"
 			, width				: 100
-			, cellClass			: 'text-center'
+			, cellClass			: 'text-right'
 			, valueFormatter	: function(params) {
 				return params.value.addComma();
 			}	

src/main/webapp/WEB-INF/views/system/UserDetailForm.html

@@ -359,6 +359,14 @@
 			return;
 		}
 		
+		if (!gagajf.checkPassword($('#userDetailForm input[name=passwd]'))) {
+			return false;
+		}
+		
+		if (!gagajf.checkPassword($('#userDetailForm input[name=passwdConfirm]'))) {
+			return false;
+		}
+		
 		mcxDialog.confirm("비밀번호를 변경하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",