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

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

@@ -3102,7 +3102,7 @@ public class TsaGoodsService {
 			return goods;
 		}
 		if (UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
-			goods.setCurrPrice(0);
+			goods.setCurrPrice(goodsOrigin.getCurrPrice());
 		} else {
 
 			if (!GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", "").matches(NUMBER_PATTERN)) {
@@ -3115,6 +3115,18 @@ public class TsaGoodsService {
 				goods.setGoodsStat("10");
 				return goods;
 			}
+			
+			if (Integer.parseInt(goodsMass.getCurrPrice().trim()) > goodsOrigin.getListPrice()) {
+				goods.setGoodsRegMsg("판매가 오류(정상가보다 높음)");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			
+			//판매가 변경시
+			goods.setCurrPrice(Integer.parseInt(GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", ""))); // 판매가
+			goods.setCurrBprice(goodsOrigin.getCurrPrice());
+			goods.setDcRate((int)(this.getDcRate(goodsOrigin.getListPrice(), goods.getCurrPrice())));
+			goods.setChDataYn("Y");
 		}
 		//판매수수료율
 		if (StringUtils.isBlank(goodsMass.getSellFeeRate())) {
@@ -3124,7 +3136,7 @@ public class TsaGoodsService {
 		}
 		float sellFeeRate = 0f;
 		if (UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
-			goods.setSellFeeRate(0);
+			goods.setSellFeeRate(goodsOrigin.getSellFeeRate());
 		} else {
 			try {
 				sellFeeRate = Float.valueOf(goodsMass.getSellFeeRate().trim());
@@ -3147,48 +3159,11 @@ public class TsaGoodsService {
 				goods.setGoodsStat("10");
 				return goods;
 			}
-		}
+			
+			goods.setSellFeeRate(sellFeeRate); // 판매수수료율
+			goods.setChDataYn("Y");
+		
 
-		//판매가나 판매수수료율이 변경되었을 때
-		if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim()) || !UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
-			//자사
-			if ("Y".equals(goodsOrigin.getSelfGoodsYn())) {
-				//판매가 변경시
-				if (!UPDATE_NO_PATTERN.equals(goodsMass.getCurrPrice().trim())) {
-					goods.setCurrPrice(Integer.parseInt(GagaStringUtil.replace(goodsMass.getCurrPrice().trim(), ",", ""))); // 판매가
-					goods.setCurrBprice(goodsOrigin.getCurrPrice());
-					goods.setDcRate((int)(this.getDcRate(goodsOrigin.getListPrice(), goods.getCurrPrice())));
-					goods.setChDataYn("Y");
-				}
-				//판매수수료율 변경시
-				if (!UPDATE_NO_PATTERN.equals(goodsMass.getSellFeeRate().trim())) {
-					goods.setSellFeeRate(sellFeeRate); // 판매수수료율
-					goods.setChDataYn("Y");
-				}
-			} else {
-				//입점
-				GoodsPriceRes goodsPriceRes = new GoodsPriceRes();
-				goodsPriceRes.setGoodsCd(goods.getGoodsCd());
-				if (goods.getCurrPrice() != goodsOrigin.getCurrPrice()) {
-					goodsPriceRes.setResGoodsPrice(goods.getCurrPrice());
-					goodsPriceRes.setEndGoodsPrice(goods.getCurrPrice());
-				}
-				if (goods.getSellFeeRate() != goodsOrigin.getSellFeeRate()) {
-					goodsPriceRes.setSellFeeRate(sellFeeRate);
-				}
-				goodsPriceRes.setApplyStdt(GagaDateUtil.getTodayDateTime());	//yyyymmddhhmiss
-				int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) + 4;
-				goodsPriceRes.setApplyEddt(Integer.toString(toYear) + "1231235959");	//yyyymmddhhmiss
-				goodsPriceRes.setCfrmYn("N");
-				goodsPriceRes.setApplyYn("N");
-				goodsPriceRes.setRegNo(goods.getRegNo());
-				goodsPriceRes.setUpdNo(goods.getUpdNo());
-				goodsDao.createGoodPriceRes(goodsPriceRes);
-
-				// 상품테이블에 바로 변경하지 않고 입점상품가격관리에서 승인해야함
-				goods.setCurrPrice(goodsOrigin.getCurrPrice());
-				goods.setSellFeeRate(goodsOrigin.getSellFeeRate());
-			}
 		}
 
 		// 상품구분

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

@@ -527,6 +527,38 @@ public class TsaCustomerController extends TsaBaseController {
 
 		return mav;
 	}
+	
+	/**
+	 * 메시지 발송 팝업 화면
+	 *
+	 * @param elementCellPhnno - 휴대폰
+	 * @param elementCustNo - 고객일련번호
+	 * @param maskingCellPhnno - 마스킹된 휴대폰
+	 * @return ModelAndView
+	 * @author moon
+	 * @since 2021. 09. 07
+	 */
+	@GetMapping("/lms/popup/form2")
+	public ModelAndView lmsPopupForm2(@RequestParam(value = "elementCellPhnno", required = false) String elementCellPhnno, @RequestParam(value = "elementCustNo") String elementCustNo, @RequestParam(value = "elementMaskingCellPhnno", required = false) String maskingCellPhnno, @RequestParam(value = "pageGb", required = false) String pageGb) {
+		ModelAndView mav = new ModelAndView();
+		// 휴대폰 번호
+		mav.addObject("elementCellPhnno", elementCellPhnno);
+
+		// 휴대폰 번호
+		mav.addObject("maskingCellPhnno", StringUtils.defaultString(maskingCellPhnno, ""));
+
+		// 고객 아이디
+		mav.addObject("elementCustNo", elementCustNo);
+
+		mav.addObject("callBack", TscConstants.CALLCENTER_TEL_NO);
+
+		mav.addObject("pageGb", StringUtils.defaultString(pageGb, ""));
+
+		mav.setViewName("customer/LmsPopupForm2");
+
+		return mav;
+	}
+	
 
 	/**
 	 * 메시지 발송
@@ -573,6 +605,29 @@ public class TsaCustomerController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0005"));
 	}
+	
+	/**
+	 * 메시지 발송
+	 *
+	 * @param customer -고객정보
+	 * @return GagaResponse
+	 * @author moon
+	 * @since 2021. 09. 07
+	 */
+	@PostMapping("/message/send3")
+	@ResponseBody
+	public GagaResponse sendLms3(@RequestBody Customer customer) {
+		//Customer custInfo = customerService.getCustomerInfo(customer.getCustNo());
+		//customer.setCustNm(custInfo.getCustNm());
+		//customer.setCustNo(custInfo.getCustNo());
+		log.info("sendLms3 {}"+customer);
+		if (StringUtils.isNotBlank(customer.getCellPhnno())) {
+			Integer userNo = TsaSession.getInfo().getUserNo();
+			kakaotalkService.sendBasicLms3(customer, userNo);
+		}
+
+		return super.ok(message.getMessage("SUCC_0005"));
+	}	
 
 	/**
 	 * 메시지 발송 팝업 화면

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

@@ -22,6 +22,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.excel.GagaExcelUtil;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaDateUtil;
+import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.admin.biz.service.TsaCardPromotionService;
 import com.style24.admin.biz.service.TsaCommonService;
 import com.style24.admin.biz.service.TsaFreegiftPromotionService;
@@ -69,13 +75,6 @@ import com.style24.persistence.domain.User;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.GagaExcelUtil;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
-
 /**
  * 마케팅 Controller
  * @author xodud1202
@@ -206,12 +205,21 @@ public class TsaMarketingController extends TsaBaseController {
 			review.setGoodsCds(review.getGoodsCd().replaceAll("\r", "").split("\n"));
 		}
 
+		// 고객 관련 정보 암호화 처리
+		if (StringUtils.isNotBlank(review.getSearchTxt())) {
+			review.encryptData();
+		}
+
+		log.info("pageNo >>> {}", review.getPageNo());
+
 		review.setPageable(new TscPageRequest(review.getPageNo() - 1, review.getPageSize()));
 		review.getPageable().setTotalCount(reviewService.getReviewTotalCount(review));
 
 		// 상품평 목록
 		Collection<Review> reviewList = reviewService.getReviewList(review);
 
+		log.info("dataList >>> {}", reviewList);
+
 		result.set("paging", review);
 		result.set("dataList", reviewList);
 

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

@@ -265,20 +265,33 @@ public class TsaOrderChangeController extends TsaBaseController {
 		}
 		// 취소완료
 		else {
-			result = coreOrderChangeService.partialCancel(map, userNo);
-			
+			String allCanYn = refundPreInfo.getString("allCanYn");
+
+			if ("Y".equals(allCanYn)) {
+				cnclReq.setChgGb(TscConstants.OrderChangeGb.CANCEL.value());
+				cnclReq.setPgStat("N");
+				cnclReq.setRegNo(userNo);
+				cnclReq.setUpdNo(userNo);
+
+				// 전체 취소 처리
+				Integer ordChgSq = coreOrderChangeService.allCnclComplete(cnclReq);
+				result.setInt("ordChgSq", ordChgSq);
+			} else {
+				result = coreOrderChangeService.partialCancel(map, userNo);
+			}
+
 			String pgGb = map.getString("pgGb");
-			
+
 			if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				List<Order> cancelOrderRefundList 	= (List<Order>) map.get("cancelOrderRefundList");
 
 				for(Order vo : cancelOrderRefundList) {
-					
+
 					try {
 						// 2021.07.30 수정
 						if (vo.getOrdCanChgQty() > 0) {
 							Order order = coreNaverPayService.getOrderDetailInfoFromOrdDtlNo(vo);
-							
+
 							if ("O".equals(order.getOrdExchGb())) {
 								// 취소 완료
 								if ("scm".equals(env.getProperty("server.site.name"))) {
@@ -300,11 +313,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 									// coreNaverPayService.sendNaverPayRejectExchange(exception, userNo);        // 교환반려
 									addUrl = "/naverpay/send/reject/exchange?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 교환 반려
-	
+
 									// coreNaverPayService.sendNaverPaySoldoutReturnReq(param, userNo);				// 품절반품접수
 									addUrl = "/naverpay/send/soldout/return/req?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                            // 품절반품접수
-	
+
 									// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
 									addUrl = "/naverpay/send/return/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 반품완료
@@ -441,7 +454,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		order.setOrdDtlStatArr(ordDtlStatArr);
 
 		// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트
-		order.setChgGb(TscConstants.OrderChangeGb.RETURN.value());
+		// 2021.09.07 관리자 반품 요청 화면은 정상 동작 처리
+		//order.setChgGb(TscConstants.OrderChangeGb.RETURN.value());
 		List<Order> cancelRequestTargetList 		= coreOrderChangeService.getCancelRequestTargetList2(order);
 		List<Order> orderChangeDetailList 			= coreOrderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList 			= coreOrderService.getOrderInfoList(order);
@@ -794,8 +808,9 @@ public class TsaOrderChangeController extends TsaBaseController {
 			ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
 			order.setOrdDtlStatArr(ordDtlStatArr);
 		}
-
-		order.setChgGb(TscConstants.OrderChangeGb.EXCHANGE.value());
+		
+		// 2021.09.07 관리자 교환 요청 화면은 정상 동작 처리
+		//order.setChgGb(TscConstants.OrderChangeGb.EXCHANGE.value());
 		Collection<Order> cancelRequestTargetList = coreOrderChangeService.getCancelRequestTargetList(order);
 		Collection<Order> orderChangeDetailList = coreOrderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList = coreOrderService.getOrderInfoList(order);

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

@@ -162,7 +162,16 @@ public class TsaWithdrawController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		
 		result.set("refundConfirmPreInfo"	, orderChangeService.refundConfirmPreInfo(orderChange));
-		result.set("dataList"				, withdrawService.getRefundDetailList(withdraw));
+		
+		Collection<Withdraw> dataList = withdrawService.getRefundDetailList(withdraw);
+		result.set("dataList"				, dataList);
+		
+		if (dataList != null && dataList.size() > 0) {
+			Order order = new Order();
+			order.setOrdNo(dataList.iterator().next().getOrdNo());
+			order.setDelvFeeCd(dataList.iterator().next().getDelvFeeCd());
+			result.set("returnOrderInfo", orderChangeService.getReturnOrderInfo(order));
+		}
 		
 	//	Collection<Withdraw> dataList = withdrawService.getRefundDetailList(withdraw);
 		return result;

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

@@ -96,4 +96,7 @@ public class Review extends TscBaseDomain {
 	private int pntAmt;				// 포인트금액
 	private String pntUploadStat;	// 포인트반영상태
 
+	public void encryptData () {
+		this.searchTxt = CryptoUtils.encryptAES(this.searchTxt);
+	}
 }

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

@@ -324,7 +324,7 @@
 		       (SELECT CONCAT(IFNULL(SUPPLY_COMP_CD,#{supplyCompCd}),'_',IFNULL(LPAD(SUBSTRING(MAX(DELV_FEE_CD),INSTR(MAX(DELV_FEE_CD),'_') + 1) + 1,2,'0'),'01'))
 		        FROM   TB_DELV_FEE_POLICY Z
 		        WHERE  SUPPLY_COMP_CD LIKE CONCAT(#{supplyCompCd},'%')
-		       )
+		        GROUP BY SUPPLY_COMP_CD)
 		     , #{supplyCompCd}
 		     , #{delvFeeCrite}
 		     , IFNULL(#{minOrdAmt},0)

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

@@ -507,7 +507,7 @@
 		     , CASE WHEN WD_SHIP_STATE = '12' THEN   FN_GET_CODE_NM('G321', Z.WD_REASON_CD)
 		            WHEN WD_SHIP_STATE = '84' THEN   FN_GET_CODE_NM('G322', Z.WD_REASON_CD) ELSE '' END AS WD_REASON_CD_NM
 		     , FN_GET_CODE_NM('G685', Z.CHG_STAT) AS CHG_STAT_NM
-		     , CASE WHEN Z.WD_GB = 'W' THEN '회수요청' ELSE '직접배송' END AS WD_GB_NM 
+		     , CASE WHEN Z.WD_GB = 'W' THEN '방문회수' ELSE '직접배송' END AS WD_GB_NM 
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_CHG_SQ, A.ORD_NO DESC, A.ORD_DTL_NO )  RNUM 
 		    FROM ( 
@@ -519,7 +519,7 @@
 						     , OC.CHG_REASON                            -- 변경사유 반품G688 교환G689
 						     , OC.WD_GB                                 -- 직접배송여부
 						     , DATE_FORMAT(OC.REG_DT, '%Y-%m-%d') AS REG_DT  -- 회수요청일
-						     , (SELECT SC.SWT_SHIP_COMP_CD FROM TB_SHIP_COMPANY SC WHERE SC.SHIP_COMP_CD = OC.SHIP_COMP_CD  ) AS SHIP_COMP_CD 
+						     , OC.SHIP_COMP_CD
 						     , OC.WD_INVOICE_NO                         -- 회수송장번호
 						     , OC.WD_SHIP_STATE                         -- 배송업체회수상태 G320
 						     , OC.WD_STATE_DT                           -- 회수상태 수신일시 
@@ -732,6 +732,7 @@
 				, P.PG_GB
 				, FN_GET_CODE_NM('G014', P.PAY_MEANS) AS PAY_MEANS_NM
 				, P.CARD_NM
+				, C.DELV_FEE_CD
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON B.ORD_CHG_SQ = A.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C ON C.ORD_DTL_NO = B.ORD_DTL_NO 

src/main/resources/i18n/messages/message_ko_KR.properties

@@ -82,7 +82,7 @@ DELIVERY_0001=\uB4F1\uB85D \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. \uC774\uB
 
 #\uCFE0\uD3F0
 COUPON_0001=\uCD1D {0}\uC7A5\uC758 \uCFE0\uD3F0\uC744 \uB2E4\uC6B4\uB85C\uB4DC \uD558\uC600\uC2B5\uB2C8\uB2E4.
-COUPON_0002=\uC774\uBBF8 \uB2E4\uC6B4\uB85C\uB4DC\uB97C \uC644\uB8CC \uD558\uC168\uC2B5\uB2C8\uB2E4.
+COUPON_0002=\uBC1B\uC744 \uCFE0\uD3F0\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. 1\uAC74 \uAD6C\uB9E4 \uD558\uC2DC\uACE0 \uB2E4\uC74C\uB2EC \uB4F1\uAE09 \uCFE0\uD3F0\uC744 \uBC1B\uC544\uBCF4\uC138\uC694!
 
 #\uAD50\uD658
 EXCHANGE_0001=\uAD50\uD658 \uC2E0\uCCAD\uC774 \uC811\uC218\uB418\uC5C8\uC2B5\uB2C8\uB2E4.

src/main/webapp/WEB-INF/views/common/fragments/lnb.html

@@ -71,7 +71,14 @@
 				monthNames: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']
 			};
 			$('.schMonth').monthpicker(options);
-
+			// make year selector
+			for (var i = finalYear; i >= startYear; i--) {
+				if (currentYear == i ) {
+					$(".schYear").append("<option value='" + i + "' selected class='ui-state-highlight'>" + i + "</option>");
+				} else {
+					$('.schYear').append("<option value='" + i + "'>" + i + "</option>");
+				}
+			}
 			//조회폼에서 엔터키 입력시 자동조회
 			if ($('#btnSearch').length == 1) {
 				$("#main").find("form:first").on('keyup', function(e) {
@@ -82,6 +89,12 @@
 					}
 				})
 			}
+			
+			//년-월
+			$(".schBtn").on('click', function () {
+				var thisId= $(this).attr("data-id");
+				$('#'+thisId).monthpicker('show');
+			});
 		});
 		$(window).scrollTop(0);
 	}

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

@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : LmsPopupForm2.html
+ * @desc    : 메시지발송팝업 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.01.21   jsshin     최초 작성
+ *******************************************************************************
+ -->
+
+	<div class="modelessPopup draggable" data-width="800">
+		<div class="panelStyle">
+			<!-- TITLE -->
+			<div class="panelTitle">
+				<strong>LMS 발송</strong>
+				<button type="button" class="close" onclick="uifnPopupClose('popupLmsForm2')"><em class="fa fa-times"></em></button>
+			</div>
+			<!-- //TITLE -->
+			<!-- CONTENT -->
+			<div class="panelContent">
+				<form id="lmsForm" name="lmsForm">
+					<table class="frmStyle">
+						<colgroup>
+							<col style="width:1%"/>
+							<col style="width:40%"/>
+						</colgroup>
+						<tbody>
+						<tr >
+							<th>수신자번호<em class="required" title="필수"></em></th>
+							<td th:if="${maskingCellPhnno == ''}">
+								<input type="text" class="w150" name="cellPhnno" data-valid-name="수신번호"  required="required"  maxlength="13" />
+							</td>
+							<td th:unless="${maskingCellPhnno == ''}">
+								<input type="hidden" name="cellPhnno"/>
+								<input type="text" class="w150" name="maskingCellPhnno" readonly="readonly"/>
+							</td>
+						</tr>
+						<tr>
+							<th>발신자번호<em class="required" title="필수"></em></th>
+							<td>
+								<input type="text" class="w150" name="callcenterTelNo" data-valid-name="발신자번호" readonly="readonly" th:value="${callBack}" maxlength="11" />
+							</td>
+						</tr>
+						<tr>
+							<th>메시지<em class="required" title="필수"></em></th>
+							<td>
+								<span name="topStr">[STYLE24]안녕하세요. 스타일24입니다.</span>
+								<textarea class="textareaR4"  style="resize: none;" name ="content" ></textarea>
+								스타일24 바로가기 : https://www.style24.com<br>
+								스타일24 고객센터 : 1544-5336<br>
+								<span name="count">0</span> / 2000 byte
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</form>
+			</div>
+			<ul class="panelBar">
+				<li class="right">
+					<button type="button" class="btn btn-success btn-lg" id="btnSendSms">발송</button>
+					<button type="button" class="btn btn-gray btn-lg" onclick="uifnPopupClose('popupLmsForm2')">취소</button>
+				</li>
+			</ul>
+			<!-- //CONTENT -->
+		</div>
+	</div>
+
+<script th:inline="javascript">
+	/*<![CDATA[*/
+	const elementCellPhnno = [[${elementCellPhnno}]];
+	const elementCustNo = [[${elementCustNo}]];
+	const maskingCellPhnno = [[${maskingCellPhnno}]];
+	const pageGb = [[${pageGb}]];
+
+	// 메시지 전송
+	$("#btnSendSms").on("click",function() {
+		let formId = '#lmsForm';
+		let custNo = gagajf.isNull(pageGb) ? $(elementCustNo).val() : elementCustNo;
+		
+		const $callcenterTelNo = $(formId+' input[name=callcenterTelNo]');
+		if(gagajf.isNull($callcenterTelNo.val())) {
+			mcxDialog.alertC("발신자번호를 입력해 주세요.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$callcenterTelNo.focus();
+				}
+			});
+			return;
+		}		
+		
+		if(!gagajf.validation(formId)){
+			return;
+		}
+		
+		const $content = $(formId+' textarea[name=content]');
+		
+		if(gagajf.isNull($content.val())) {
+			mcxDialog.alertC("보낼 메시지를 입력해 주세요.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$content.focus();
+				}
+			});
+			return;
+		}
+		
+
+		
+		mcxDialog.confirm("저장하시겠습니까?", {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function() {
+				let params = $(formId).serializeObject();
+				//params.custNo = custNo;
+				let jsonData = JSON.stringify(params);
+				//if(gagajf.isNull(pageGb)){
+					// gagajf.ajaxJsonSubmit('/customer/message/send', jsonData, uifnPopupClose('popupLmsForm'));
+				//} else {
+					gagajf.ajaxJsonSubmit('/customer/message/send3', jsonData, uifnPopupClose('popupLmsForm'));
+				//}
+			}
+		});
+		
+
+	});
+
+	// LMS 글자수 변경 이벤트
+	$("#lmsForm textarea[name=content]").bind('focus focusout input keyup keydown paste change', function () {
+		cfnGetTextLength($(this), 2000, $('#lmsForm span[name=count]'));
+	});
+
+	var fnInitDataSet = function () {
+		let cellPhnno = gagajf.isNull(pageGb) ? $(elementCellPhnno).val() : elementCellPhnno;
+		if (gagajf.isNull(maskingCellPhnno)) {
+			$('#lmsForm input[name=cellPhnno]').val(cellPhnno);
+		} else {
+			let mkCellPhno = gagajf.isNull(pageGb) ? $(maskingCellPhnno).val() : maskingCellPhnno;
+			$('#lmsForm input[name=cellPhnno]').val(cellPhnno);
+			$('#lmsForm input[name=maskingCellPhnno]').val(mkCellPhno);
+		}
+	}
+
+	$(document).ready(function() {
+		fnInitDataSet();
+	
+		cfnGetTextLength("#lmsForm textarea[name=content]", 2000, $('#lmsForm span[name=count]'));
+	
+		$('#popupLmsForm2 .modelessPopup').draggable({'cancel':'.panelContent'});
+	});
+	/*]]>*/
+</script>
+</html>

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -284,6 +284,11 @@
 		{headerName: "휴대번호", 		field: "maskingOrdPhnno", 		width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return params.data.maskingOrdPhnno; }
 		},
+		{headerName: "LMS", 			field: "maskingOrdPhnno", 	width: 80, cellClass: "text-center",
+			cellRenderer: function(params) {
+				return '<button type="button" class="btn btn-base btn-sm" onclick="fnLms(\'' + params.data.ordPhnno + '\',\'' + params.data.custNo + '\');">&nbsp;LMS&nbsp;</button>';
+			}			
+		},
 		{headerName: "수령인", 		field: "maskingRecipNm", 		width: 100, cellClass: 'text-center'},
 		{headerName: "공급업체", 		field: "supplyCompNm", 	width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드", 		field: "brandNm", 	width: 150, cellClass: 'text-center'},
@@ -481,6 +486,17 @@
 		cfnOpenModalPopup(actionUrl, 'popupDeliveryDetailItemForm');
 	}
 	
+	/*************************************************************************
+	*  LMS
+	**************************************************************************/	
+	var fnLms = function(chgerPhnno, custNo){
+		let param = {};
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
+		param.pageGb = 'delv';
+		cfnOpenLmsPopup2(param);
+	}
+
 	
 	/*************************************************************************
 	* 엑셀다운로드 

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

@@ -66,7 +66,7 @@
 				<ul class="boxContent">
 					<li class="boxContentTop">
 						<div class="panelContent" style="overflow: hidden;">
-							<th:block th:if="${sessionInfo.roleCd == 'G001_0000'}">
+							<th:block th:if="${sessionInfo.roleCd == 'G001_0000' or sessionInfo.roleCd == 'G001_A101'}">
 								<ul class="panelBar">
 									<li>
 										<span class="btnLeft" style="">
@@ -87,7 +87,7 @@
 								</ul>
 							</th:block>
 							<ul class="panelBar">
-								<th:block th:if="${sessionInfo.roleCd == 'G001_0000'}">
+								<th:block th:if="${sessionInfo.roleCd == 'G001_0000' or sessionInfo.roleCd == 'G001_A101'}">
 									<li>
 										<span class="cBlue">* 마우스 드래그&드랍으로 레이아웃 순서 변경 가능하며 X 버튼으로 삭제 가능합니다.</span>
 									</li>
@@ -113,7 +113,7 @@
 										<button type="button" class="btn btn-default btn-lg" id="btnAllUpd">일괄적용</button>
 									</span>
 								</li>
-								<th:block th:if="${sessionInfo.roleCd == 'G001_0000'}">
+								<th:block th:if="${sessionInfo.roleCd == 'G001_0000' or sessionInfo.roleCd == 'G001_A101'}">
 									<li class="right">
 										<span class="cRed">* 레이아웃 저장 버튼 클릭 시 수정 및 삭제 된 레이아웃이 즉시 적용 됩니다.</span><br/>
 										<span class="cRed">* 화면 캡처파일 관리는 SUPER관리자, 어드민관리자만 가능합니다.</span>
@@ -151,7 +151,15 @@
 	var fnGetMainDisplayList = function (cate){
 		if(cate=='cate1'){
 			var cate1Val = $("#searchForm select[name=cate1No] option:selected").val().split(',')[0];		//1700,Y
-
+			if( [[${sessionInfo.roleCd}]] == 'G001_A101'){
+				console.log("=> "+cate1Val +" // "+[[${sessionInfo.roleCd}]]);
+				if( "1700" != cate1Val && "1715" != cate1Val) {
+					$("#btnSave").show();
+				}else{
+					$("#btnSave").hide();
+				}	
+			}
+			
 			if((!gagajf.isNull(cate1Val)&&cate1Val=='1711') || (!gagajf.isNull(cate1Val)&&cate1Val=='1721')){
 				$("#searchForm").find("td[name=cate2Select]").css('display','none');
 				$("#searchForm").find("td[name=cate2Search]").css('display','block');

src/main/webapp/WEB-INF/views/error/404.html

@@ -37,7 +37,7 @@
 			입력하신 주소가 정확한지 다시 한 번 확인해 주시기 바랍니다.
 		</li>
 		<li class="tel">
-			문의 : 크리스F&C(주) 고객센터 (080-001-1270)
+			문의 : 스타일24(주) 고객센터 (1544-5336)
 		</li>
 	</ul>
 	<div class="errBtn">

src/main/webapp/WEB-INF/views/error/500.html

@@ -37,7 +37,7 @@
 			잠시 후 해당 서비스를 이용해 주시기 바랍니다.
 		</li>
 		<li class="tel">
-			문의 : 크리스F&C(주) 고객센터 (080-001-1270)
+			문의 : 스타일24(주) 고객센터 (1544-5336)
 		</li>
 	</ul>
 	<div class="errBtn">

src/main/webapp/WEB-INF/views/error/nosession.html

@@ -36,7 +36,7 @@
 			로그인 후 서비스를 이용해 주시기 바랍니다.
 		</li>
 		<li class="tel">
-			문의 : 크리스F&C(주) 고객센터 (080-001-1270)
+			문의 : 스타일24(주) 고객센터 (1544-5336)
 		</li>
 	</ul>
 	<div class="errBtn">

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

@@ -68,7 +68,7 @@
 								<option value="memNm">회원명</option>
 								<option value="email">이메일</option>
 							</select>
-							<input type="text" name="seachTxt" class="w100" maxlength="50"/>
+							<input type="text" name="searchTxt" class="w100" maxlength="50"/>
 						</td>
 						<th>포인트지급상태</th>
 						<td>
@@ -261,7 +261,8 @@
 	// 조회
 	$('#btnSearch').on('click', function() {
 		gagaPaging.init('searchForm', fnSearchCallBack, 'pagination', $('#searchForm input[name=pageSize]').val());
-		gagaPaging.load($("#searchForm input[name=pageNo]").val());
+		//gagaPaging.load($("#searchForm input[name=pageNo]").val());
+		gagaPaging.load(1);
 	});
 
 	// 조회 콜백함수

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

@@ -81,7 +81,9 @@
 							</td>
 							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].ordEmail}"></td>
-							<td th:text="${orderInfo[0].ordPhnno}"></td>
+							<td>
+							<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>
+							</td>
 							<td th:text="${orderInfo[0].custGbNm}"></td>
 							<td th:text="${orderInfo[0].managedRsnNm}"></td>
 							<td th:text="${orderInfo[0].custGradeNm}"></td>
@@ -415,13 +417,11 @@ var columnDefsGoodsInfo = [
 							paramData 		+= '@' + params.data.delvFeeCd;
 							paramData 		+= '@' + params.data.delvFeeCdGrp;
 							paramData 		+= '@' + params.data.ordDtlStat;
-														
-							if (params.data.changeableYn == 'Y') {
-								retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + paramData + '\', null);">반품요청</button>';
-							}
-							if (params.data.returnableYn == 'Y') {
-								retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnExchangeRequest(\'' + paramData + '\', null);">교환요청</button>';
-							}
+							
+							// 2021.09.07 관리자에서는 교환신청, 반품신청 가능하게 수정
+							retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + paramData + '\', null);">반품요청</button>';
+							retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnExchangeRequest(\'' + paramData + '\', null);">교환요청</button>';
+							
 						}
 					}
 					return retStr;
@@ -862,7 +862,8 @@ var columnDefsOrderChangeInfo = [
 			
 			// 2021.06.29 변경구분값으로 변경
 			// 2021.07.19 as-is 변경정보는 TB_ORDER_DETAIL_ITEM_HST 정보가 존재하지 않음
-			if (params.data.chgItemCnt > 0) {
+			//if (params.data.chgItemCnt > 0) {
+				
 				// 취소요청
 				if (params.data.chgGb == "G680_20") {
 					rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
@@ -878,9 +879,10 @@ var columnDefsOrderChangeInfo = [
 				else {
 					rtnStr = params.value;
 				}
-			} else {
-				rtnStr = params.value;
-			}
+				
+			//} else {
+				//rtnStr = params.value;
+			//}
 			
 			return  rtnStr;
 		}
@@ -1141,6 +1143,18 @@ $(document).ready(function () {
 			cfnOpenCustDetailPopup(custNo);
 		}
 	});
+	
+	// LMS
+	$(".lmsPop").on("click", function(){
+		//var custNo = $(this).attr("custNo");
+		var orderPhnno = $(this).attr("orderPhnno");
+		let param = {};
+		param.elementCellPhnno = orderPhnno; 
+		param.elementCustNo =    ""; 
+		param.pageGb = 'delv';
+		cfnOpenLmsPopup2(param);
+		
+	});	
 });
 
 //0원이하이면 '-' 처리 삭제 함수

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

@@ -1773,9 +1773,11 @@ $(document).ready(function() {
 		// 2021.07.13 회수예외정보가 있고 회수요청, 상품검수중 상태에서 철회 가능 처리
 		// 2021.07.22 택배사 회수 불가 시 회수요청상태에서 반품철회 처리
 		//if (chgStat != "G685_50" && chgStat != "G685_51" && (recallExceptionInfo == null || (chgStat != "G685_30" && chgStat != 'G685_31'))) {
-		if (chgStat != "G685_50" && chgStat != "G685_51") {
-			$("#rtnReqCancelBtn").css("display", "none");
-		}
+		
+		// 2021.09.07 반품철회 전체 상태 오픈 현업(정지혜 과장 요청)
+		//if (chgStat != "G685_50" && chgStat != "G685_51") {
+			//$("#rtnReqCancelBtn").css("display", "none");
+		//}
 		
 		// 회수요청 상태에서 택배사 회수 불가 or 회수예외정보 존재 시 반품철회 가능
 		if (chgStat == 'G685_30' && (recallExceptionInfo != null || canRequestCancelYn == 'Y')) {

src/main/webapp/WEB-INF/views/settle/GiftcardSettleForm.html

@@ -45,7 +45,7 @@
 							</select>
 							<span id="spanSettle">
 								<input type="text" class="schMonth w60" name="settleYm" id="settleYm" maxlength="7"/>
-								<button type="button" class="btn icn schBtn" data-id="useYm"><i class="fa fa-calendar" aria-hidden="true"></i></button>
+								<button type="button" class="btn icn schBtn" data-id="settleYm"><i class="fa fa-calendar" aria-hidden="true"></i></button>
 							</span>
 							<span id="terms" style="display: none;">
 								<span class="nowrap">

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -271,8 +271,10 @@
 	var delvExpnYn  = "";   // 출고예외(확정후 품절,불량)여부
 	var wdGb        = "";
 	var mallGb      = "";
-	var reFundInfo  = [[${refundConfirmPreInfo}]]; // 환불컨펌 정보 
-	
+	var reFundInfo  = [[${refundConfirmPreInfo}]]; // 환불컨펌 정보
+
+	var returnOrderInfo;
+
 	var columnDefsDetail = [
 		{headerName: "주문변경번호", 	field: "ordChgSq",	width: 100, minWidth: 100, cellClass: 'text-center'},
 		{headerName: "주문번호", 		field: "ordNo", 	width: 100, minWidth: 100, cellClass: 'text-center',
@@ -335,6 +337,7 @@
 	**************************************************************************/	
 	var fnWithdrawDetailCallback = function(result) {
 		reFundInfo = result.refundConfirmPreInfo; // 환불 컨펌 환불 정보
+		returnOrderInfo = result.returnOrderInfo;
 		
 		if (result.dataList.length < 1) {
 			mcxDialog.alert('회수데이터 오류입니다. 운영팀에 문의 해주세요! ');
@@ -497,6 +500,39 @@
 		let addDelvFee			= 0;
 		let refundAmt;
 		
+		// 2021.09.07 card007 전체반품 원배송비 무료 해택 차감 처리
+		console.log('delvCanYn : ' + reFundInfo.delvCanYn);
+		console.log('delvFeeCdCanList : ' + reFundInfo.delvCanYn.delvFeeCdCanList);
+		console.log('allDelvCanYnList : ' + reFundInfo.delvCanYn.allDelvCanYnList);
+		let delvFeeCdCanList = reFundInfo.delvCanYn.delvFeeCdCanList;
+		let allDelvCanYnList = reFundInfo.delvCanYn.allDelvCanYnList;
+		
+		let index = -1;
+		$.each(delvFeeCdCanList, function(idx, item) {
+			console.log('delvFeeCd : ' + reFundInfo.delvFeeCd);
+			console.log('item : ' + item);
+			if (reFundInfo.delvFeeCd == item) {
+				index = idx;
+			}
+		});
+		
+		let allDelvCanYn;
+		if (index > -1) {
+			allDelvCanYn = allDelvCanYnList[index]
+		}
+		
+		console.log('allDelvCanYn : ' + allDelvCanYn);
+		let orgDelvFee = 0;
+		console.log('returnOrderInfo : ' + returnOrderInfo);
+		console.log('delvGfcdUseAmt : ' + returnOrderInfo[0].delvGfcdUseAmt);
+		console.log('realDelvAmt : ' + returnOrderInfo[0].realDelvAmt);
+		console.log('orgDelvFee : ' + returnOrderInfo[0].orgDelvFee);
+		if (allDelvCanYn == 'Y' && returnOrderInfo != null && returnOrderInfo[0].delvGfcdUseAmt + returnOrderInfo[0].realDelvAmt == 0) {
+			orgDelvFee = returnOrderInfo[0].orgDelvFee;
+		}
+
+		console.log('orgDelvFee : ' + orgDelvFee);
+		
 		// 출고예외(확정후 품절,불량)일 경우
 		if (delvExpnYn == "Y") {
 			// 총 주문수량  =  반품수량 배송비가 있을시 환불해줌
@@ -534,14 +570,15 @@
 						// 환불비용 = (취소상품실결제금액 + 동봉비 + 추가결제비) - 반품배송비 - 착불비
 						// 2021.08.10 card007 상품권 100% 결제 관련 로직 변경
 						leftRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost));
-						leftDelvFee = spanTotRtnDelvFee + Number(codFee);
-						delvFee = 0 - spanTotRtnDelvFee;
+						leftDelvFee = spanTotRtnDelvFee + Number(codFee) + orgDelvFee;
+						delvFee = 0 - spanTotRtnDelvFee - orgDelvFee;
 						//reFundInfo.spanRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - spanTotRtnDelvFee - Number(codFee);
 					}
 					// 직접배송
 					else {
 						leftRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost));
-						leftDelvFee = Number(codFee);
+						leftDelvFee = Number(codFee) + orgDelvFee;
+						delvFee = 0 - orgDelvFee;
 
 						if(Number(codFee) > 0){
 							codFeeAmt = Number(codFee);
@@ -600,10 +637,12 @@
 						// 2021.07.02 환불컨펌 환불금액계산
 						// 환불금액  = (취소상품실결제금액 + 동봉비 + 추가결제비) - (추가배송비 + 반품배송비 + 착불비)
 						//reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (spanTotDeliveryFee + spanTotRtnDelvFee);
-						
+						console.log('spanTotDeliveryFee : ' + spanTotDeliveryFee);
+						console.log('spanTotRtnDelvFee : ' + spanTotRtnDelvFee);
+						console.log('orgDelvFee : ' + orgDelvFee);
 						leftRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost));
-						leftDelvFee = spanTotDeliveryFee + spanTotRtnDelvFee + Number(codFee);
-						delvFee = 0 - spanTotDeliveryFee - spanTotRtnDelvFee;
+						leftDelvFee = spanTotDeliveryFee + spanTotRtnDelvFee + Number(codFee) + orgDelvFee;
+						delvFee = 0 - spanTotDeliveryFee - spanTotRtnDelvFee - orgDelvFee;
 					} 
 					// 직접배송
 					else {
@@ -619,8 +658,8 @@
 						//reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) - Number(addPaycose)) - (spanTotDeliveryFee + Number(codeFee);
 						
 						leftRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost));
-						leftDelvFee = spanTotDeliveryFee + Number(codFee);
-						delvFee = 0 - spanTotDeliveryFee;
+						leftDelvFee = spanTotDeliveryFee + Number(codFee) + orgDelvFee;
+						delvFee = 0 - spanTotDeliveryFee - orgDelvFee;
 					}
 					
 					if (leftRefundAmt < leftDelvFee) {

src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -65,8 +65,8 @@
 							<td>
 								<select name="chgGb"class="w100">
 									<option value="">&nbsp;전체&nbsp;</option>
-									<option value="G680_30"> 반품 </option>
-									<option value="G680_40"> 교환 </option>
+									<option value="G680_30"> 반품요청 </option>
+									<option value="G680_40"> 교환요청 </option>
 								</select>
 							</td>
 							<th>진행상태</th>
@@ -96,7 +96,7 @@
 									
 								</select>
 							</td>
-							<th>회수상태</th>
+							<th>CJ회수상태</th>
 							<td colspan="3">
 								<select name="wdShipState" class="w100">
 									<option value="">전체</option>
@@ -210,7 +210,7 @@
 				return retStr;
 			}			
 		},
-		{headerName: "회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
+		{headerName: "CJ회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
 		{headerName: "회수상태수신일시", field: "wdStateDt", 		width: 120, cellClass: "text-center"},
 		{headerName: "미회수사유", 		field: "wdReasonCdNm", 	width: 100, cellClass: "text-center"},
 		{headerName: "재회수지시", 		field: "wdShipState", 	width: 100,	cellClass: 'text-center',
@@ -425,10 +425,10 @@
 	**************************************************************************/	
 	var fnLms = function(chgerPhnno, custNo){
 		let param = {};
-		param.elementCellPhnno = chgerPhnno; //'010-4016-1558'; //'#custInfoForm input[name=cellPhnno]';
-		param.elementCustNo =    custNo; //'100025';// '#custInfoForm input[name=custNo]';
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
 		param.pageGb = 'delv';
-		cfnOpenLmsPopup(param);
+		cfnOpenLmsPopup2(param);
 	}
 
 	/*************************************************************************

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -666,10 +666,10 @@
 	**************************************************************************/	
 	var fnLms = function(chgerPhnno, custNo){
 		let param = {};
-		param.elementCellPhnno = chgerPhnno; //'010-4016-1558'; //'#custInfoForm input[name=cellPhnno]';
-		param.elementCustNo =    custNo; //'100025';// '#custInfoForm input[name=custNo]';
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
 		param.pageGb = 'delv';
-		cfnOpenLmsPopup(param);
+		cfnOpenLmsPopup2(param);
 	};
 	
 	/*************************************************************************

src/main/webapp/ux/js/admin.popup.js

@@ -468,6 +468,34 @@ var cfnOpenLmsPopup = function(param) {
 	cfnOpenModalPopup(actionUrl, 'popupLmsForm');
 }
 
+/**
+ * @type   : function
+ * @access : public
+ * @desc   : LMS 팝업
+ * <pre>
+ *     var param = {};
+ *     param.elementCellPhnno = 'input[name=cellPhnno]';
+ *     param.elementCustNo = 'input[name=custNo]';
+ *     param.elementMaskingCellPhnno = 'textarea[name=elementMaskingCellPhnno]'; //선택
+ *     paras.pageGb = 'delv'; // 선택
+ *     cfnOpenLmsPopup(param);
+ * </pre>
+ * @since  : 2020/02/13
+ * @author : jsshin
+ */
+var cfnOpenLmsPopup2 = function(param) {
+	var actionUrl = '/customer/lms/popup/form2?elementCellPhnno=' + encodeURIComponent(param.elementCellPhnno)
+			+ '&elementCustNo=' + encodeURIComponent(param.elementCustNo);
+	if (!gagajf.isNull(param.elementMaskingCellPhnno)) {
+		actionUrl +='&elementMaskingCellPhnno=' + encodeURIComponent(param.elementMaskingCellPhnno);
+	}
+	if (!gagajf.isNull(param.pageGb)) {
+		actionUrl +='&pageGb=' + param.pageGb;
+	}
+	cfnOpenModalPopup(actionUrl, 'popupLmsForm2');
+}
+
+
 /**
  * @type   : function
  * @access : public