Merge remote-tracking branch 'origin/master'

src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java

@@ -126,6 +126,8 @@ public class CscController {
 	private PaginationProperties paginationProperties;
 	@Autowired
 	private BOCmService boCmService;
+	@Autowired
+	private BOMaSopmalService boMaSopmalService;
 
 	/************************************************************
 	  고객센터 목록 폼
@@ -1681,6 +1683,13 @@ public class CscController {
 			regusrInfo.setRegusrDvCd("99");//비회원
 		}
 
+		// 약관정보
+		BOMaSopmalVO sopmalVO = new BOMaSopmalVO();
+		sopmalVO.setStplatDvCd("11");
+		sopmalVO.setSopmalCd(bbsctt.getSopmalCd());
+		List<DataMap> clauseList = new ArrayList<>();
+		clauseList = boMaSopmalService.selectBOClauseInformation(sopmalVO);
+
 		// 게시판 설정 정보
 		BOBbsVO bbsVO = new BOBbsVO();
 		// bbsVO에 쇼핑몰코드, 해당 게시판 set
@@ -1736,6 +1745,7 @@ public class CscController {
 		content.put("regusrInfo", regusrInfo);
 		content.put("bbscttVO", bbsctt);
 		content.put("itmList", itmList);
+		content.put("clauseList", clauseList);
 		content.put("bbsInfo", bbsInfo);
 		content.put("qesitmList", qesitmList);
 		content.put("rvwQesitmList", rvwQesitmList);

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistC.jsp

@@ -306,8 +306,16 @@
         event.preventDefault(); // 체크박스 상태 변경 방지
     }
 </script>
+<style>
+    .refund-clause {
+        border: 1px solid #e9ecef;
+        padding: clamp(12px, 3%, 18px);
+        margin-bottom: 16px;
+    }
+</style>
 <body>
 <%--시큐리티정보가져오기--%>
+<c:set value = "${resultMap.clauseList}" var = "clauseList"/>
 <c:set value = "${resultMap.regusrInfo}" var = "regusrInfo"/>
 <c:set value = "${resultMap.bbscttVO}" var = "bbscttVO"/>
 <c:set value = "${resultMap.bbsInfo}" var = "bbsInfo"/>
@@ -335,6 +343,11 @@
                     </c:choose>
                         <div class="table-wrapper">
                             <form id="bbsRegForm">
+                                <div class="refund-clause ck-content">
+                                    <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
+                                    <br><br>
+                                    <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
+                                </div>
                                 <table class="table write">
                                     <caption>게시글 등록</caption>
                                     <colgroup>

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistPopupC.jsp

@@ -265,7 +265,15 @@
         }
     }
 </script>
+<style>
+    .refund-clause {
+        border: 1px solid #e9ecef;
+        padding: clamp(12px, 3%, 18px);
+        margin-bottom: 16px;
+    }
+</style>
 <body>
+<c:set value="${resultMap.clauseList}" var="clauseList"/>
 <c:set value="${resultMap.regusrInfo}" var="regusrInfo"/>
 <c:set value="${resultMap.bbscttVO}" var="bbscttVO"/>
 <c:set value="${resultMap.bbsInfo}" var="bbsInfo"/>
@@ -284,6 +292,11 @@
         <div class="table-wrapper">
             <form id="bbsRegForm">
                 <input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
+                <div class="refund-clause ck-content">
+                    <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
+                    <br><br>
+                    <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
+                </div>
                 <table class="table write">
                     <caption>게시글 등록</caption>
                     <colgroup>

src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp

@@ -168,7 +168,7 @@
 					</c:otherwise>
 				</c:choose>
 
-				<div id="subsvcDc">구독 서비스 상품 설명</div>
+				<div id="subsvcDc" class="ck-content">구독 서비스 상품 설명</div>
 			</form>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp

@@ -91,7 +91,7 @@
                         <td>
                             <input type="text" class="m-input" id="cstmclerCd" name="cstmclerCd" title="개인통관번호(개인통관부호)" maxlength="13" placeholder="P로 시작하는 13자리 부호를 입력하세요">
                             <button class="find-address-btn" onclick="window.open('https://unipass.customs.go.kr/per/persIndex.do', '_blank'); return false;">통관번호 조회</button>
-                            <input type="hidden" class="m-input" id="prefcode" name="prefCd">
+                            <input type="hidden" class="m-input" id="prefcode" name="prefcd">
                         </td>
                     </tr>
                 </tbody>

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcUpdtPopupU.jsp

@@ -98,7 +98,7 @@
                         <input type="text" class="m-input" id="cstmclerCd" name="cstmclerCd" title="개인통관번호(개인통관부호)" value="<c:out value = "${dtlDlvylc.resultVO.cstmclerCd}"/>"
                                maxlength="13" placeholder="P로 시작하는 13자리 부호를 입력하세요">
                         <button class="find-address-btn" onclick="window.open('https://unipass.customs.go.kr/per/persIndex.do', '_blank'); return false;">통관번호 조회</button>
-                        <input type="hidden" class="m-input" id="prefcode" name="prefCd">
+                        <input type="hidden" class="m-input" id="prefcode" name="prefcd" value="<c:out value = '${dtlDlvylc.resultVO.prefcd}'/>">
                     </td>
                 </tr>
                 </tbody>

src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistC.jsp

@@ -294,7 +294,16 @@
         event.preventDefault(); // 체크박스 상태 변경 방지
     }
 </script>
+<style>
+    .refund-clause {
+        padding: clamp(16px, 3%, 18px);
+        border-radius: 8px;
+        border: 1px solid #dee2e6;
+        margin-bottom: 20px;
+    }
+</style>
 <body>
+<c:set value = "${resultMap.clauseList}" var = "clauseList"/>
 <c:set value = "${resultMap.regusrInfo}" var = "regusrInfo"/>
 <c:set value = "${resultMap.bbscttVO}" var = "bbscttVO"/>
 <c:set value = "${resultMap.bbsInfo}" var = "bbsInfo"/>
@@ -322,6 +331,11 @@
                                 <input type = "hidden" id = "bbsInfo" value = "<c:out value = '${bbsInfo.bbsInfo}'/>" name = "bbsInfo"/>
                                 <input type = "hidden" id = "bbscttSndngMthCd" value = "<c:out value = '${bbsInfo.bbscttSndngMthCd}'/>" name = "bbscttSndngMthCd"/>
                                 <input type = "hidden" id = "regusrDvCd" value = "<c:out value = '${bbscttVO.regusrDvCd}'/>" name = "regusrDvCd"/>
+                                <div class="refund-clause ck-content">
+                                    <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
+                                    <br><br>
+                                    <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
+                                </div>
                                 <div class="userForm">
                                     <div class="userForm__inputBox">
                                         <div class="userForm__inputBox__item">

src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp

@@ -262,7 +262,16 @@
          }
      }
 </script>
+<style>
+    .refund-clause {
+        padding: clamp(16px, 3%, 18px);
+        border-radius: 8px;
+        border: 1px solid #dee2e6;
+        margin-bottom: 20px;
+    }
+</style>
 <body>
+<c:set value="${resultMap.clauseList}" var="clauseList"/>
 <c:set value = "${resultMap.regusrInfo}" var = "regusrInfo"/>
 <c:set value = "${resultMap.bbscttVO}" var = "bbscttVO"/>
 <c:set value = "${resultMap.bbsInfo}" var = "bbsInfo"/>
@@ -287,6 +296,11 @@
                     <div class="microModal__inner">
                         <form id="bbsRegForm">
                             <input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
+                            <div class="refund-clause ck-content">
+                                <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
+                                <br><br>
+                                <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
+                            </div>
                             <div class="userForm">
                                 <div class="userForm__inputBox">
                                     <div class="userForm__inputBox__item">