Merge branch 'develop' into bin2107

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

@@ -5110,7 +5110,7 @@
 	</delete>
 	
 	<!-- 상품 상세 컨텐츠 저장 -->
-	<insert id="createGoodsContents" parameterType="GoodsContents" keyProperty="goodsContentsType">
+	<insert id="createGoodsContents" parameterType="GoodsContents" keyProperty="goodsContentsSq">
 		/* TsaNotice.createGoodsContents */
 		INSERT INTO TB_GOODS_CONTENTS (
 		       GOODS_CONTENTS_SQ

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

@@ -105,6 +105,8 @@
 				
 				<table class="frmStyle">
 					<colgroup>
+						<col style="width:160px;" />
+						<col style="width:320px;" />
 						<col style="width:160px;" />
 						<col style="width:320px;" />
 						<col style="width:160px;" />
@@ -125,10 +127,16 @@
 							</td>
 							<th>귀책사유</th>
 							<td><span id="imputeReason"></span></td>
+							<th>PG점프</th>
+							<td>
+								<label class="chkBox">
+									<input type="checkbox" name="pgStat" id="pgStat"/>
+								</label>
+							</td>
 						</tr>
 						<tr>
 							<th>요청메모</th>
-							<td colspan="3">
+							<td colspan="5">
 								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
 							</td>
 						</tr>
@@ -918,7 +926,7 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			// 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
 			let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
-			let sumDeliveryFee = result.sumDeliveryFee - result.spanDelvCpnDcAmt;
+			let sumDeliveryFee = result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
 			
 			$("#spanPayAmt").text(result.spanPayAmt.addComma());					//총 결제 금액
 			$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
@@ -935,7 +943,7 @@ var fnCalculateRefundAmt = function (obj) {
 			$("#spanCpn1DcAmt").text(result.spanCpn1DcAmt.addComma());				//즉시할인쿠폰
 			$("#spanGoodsCpnDcAmt").text(result.spanGoodsCpnDcAmt.addComma());		//상품쿠폰
 			$("#spanCartCpnDcAmt").text(result.spanCartCpnDcAmt.addComma());		//장바구니쿠폰
-			$("#spanDelvCpnDcAmt").text(result.spanDelvCpnDcAmt.addComma());		//배송비쿠폰
+			$("#spanDelvCpnDcAmt").text(result.spanRefundDelvCpnAmt.addComma());	//배송비쿠폰
 			
 			$("#spanTmtbDcAmt").text(result.spanTmtbDcAmt.addComma());				//취소 다다익선 금액
 			$("#spanTmtb1DcAmt").text(result.spanTmtb1DcAmt.addComma());			//수량할인
@@ -1134,6 +1142,7 @@ var fnCnclReq = function (reqGbn) {
 		,"chgStat"					: chgStat
 		,"wdGb"						: wdGb
 		,"addPayCost"				: addPayCost
+		//,"pgStat"					: $('#pgStat').is(':checked') ? 'Y' : 'N'
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌

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

@@ -72,7 +72,7 @@ var gagaSe = {
 	setContents : function(editorId, content) {
 		var newContent = "";
 		if (content != null) {
-			newContent = content.replaceAll("&lt;", "<").replaceAll("&gt;",">");
+			newContent = content.replaceAll("&lt;", "<").replaceAll("&gt;",">").replaceAll("&quot;","\"");
 		}
 
 		try {

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

@@ -109,7 +109,7 @@ var gagaSn = {
 	 * Set value to summernote
 	 */
 	setContents : function(editorId, content) {
-		var content = content.replaceAll("&lt;", "<").replaceAll("&gt;",">");
+		var content = content.replaceAll("&lt;", "<").replaceAll("&gt;",">").replaceAll("&quot;","\"");
 
 		try {
 			$(editorId).summernote('code', content);