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

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

@@ -849,6 +849,7 @@
 		     , Z.RF_TMTB2_AMT
 		     , Z.RF_GOODS_CPN_AMT
 		     , Z.RF_CART_CPN_AMT
+		     , Z.RF_DELV_CPN_AMT
 		     , Z.RF_PNT_AMT
 		     , Z.RF_PRE_PNT_AMT
 		     , Z.RF_GFCD_USE_AMT
@@ -904,6 +905,7 @@
 		             , R.RF_TMTB2_AMT
 		             , R.RF_GOODS_CPN_AMT
 		             , R.RF_CART_CPN_AMT
+		             , R.RF_DELV_CPN_AMT
 		             , R.RF_PNT_AMT
 		             , R.RF_PRE_PNT_AMT
 		             , R.RF_GFCD_USE_AMT
@@ -969,8 +971,8 @@
 				, Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
 				, Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM
 				, Z.GOODS_TYPE, Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT
-				, Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT
-				, Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_TID, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM
+				, Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT
+				, Z.RF_CNCL_AMT, Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_TID, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM
 		 ORDER BY Z.ORD_CHG_SQ DESC
 	</select>
 
@@ -1018,6 +1020,7 @@
 		     , Z.RF_TMTB2_AMT
 		     , Z.RF_GOODS_CPN_AMT
 		     , Z.RF_CART_CPN_AMT
+		     , Z.RF_DELV_CPN_AMT
 		     , Z.RF_PNT_AMT
 		     , Z.RF_PRE_PNT_AMT
 		     , Z.RF_GFCD_USE_AMT
@@ -1081,6 +1084,7 @@
 		             , R.RF_TMTB2_AMT
 		             , R.RF_GOODS_CPN_AMT
 		             , R.RF_CART_CPN_AMT
+		             , R.RF_DELV_CPN_AMT
 		             , R.RF_PNT_AMT
 		             , R.RF_PRE_PNT_AMT
 		             , R.RF_GFCD_USE_AMT
@@ -1152,7 +1156,7 @@
 		        , Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM
 		        , Z.GOODS_TYPE, Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT
-		        , Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT
+		        , Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT
 		        , Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM, Z.WD_GB, Z.CHGER_NM, Z.CHGER_PHNNO, Z.CHGER_BASE_ADDR
 		        , Z.CHGER_DTL_ADDR, Z.CHGER_RTN_MEMO, Z.WD_INVOICE_NO, Z.SHIP_COMP_CD, Z.SHIP_COMP_NM
 		 ORDER BY Z.ORD_CHG_SQ DESC

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

@@ -1317,6 +1317,7 @@
 		AND ORD_NO        = #{ordNo}
 		AND ORD_DTL_NO    = #{ordDtlNo}
 		AND GOODS_CD      = #{goodsCd}
+		AND REVIEW_SQ    != #{reviewSq}
 	</select>
 	
 	<insert id="createReviewPoint" parameterType="Point" useGeneratedKeys="true" keyProperty="custPntSq">

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html

@@ -152,7 +152,7 @@
 										<dt>할인 금액 차감</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreReturnDetailFormMob.html

@@ -217,7 +217,7 @@
 										<dt>할인 금액 차감</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageDeliveryInfoFormMob.html

@@ -123,7 +123,7 @@
 								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 									<div class="goods_btn_wrap btn_group_flex">
 										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
 								<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
@@ -208,7 +208,7 @@
 										</th:block>
 										<!-- //리뷰사용불가능, 리뷰등록후일때 -->
 
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
@@ -237,7 +237,7 @@
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
 									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
 											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -130,7 +130,7 @@
 								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 									<div class="goods_btn_wrap btn_group_flex">
 										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
 								<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
@@ -467,7 +467,7 @@
 										</th:block>
 										<!-- //리뷰사용불가능, 리뷰등록후일때 -->
 
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
@@ -496,7 +496,7 @@
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
 									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
 											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListInfoMob.html

@@ -114,7 +114,7 @@
 										</button>
 									</div>
 									<div>
-										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
 											<span>쇼핑백 담기</span>
 										</button>
 									</div>
@@ -276,7 +276,7 @@
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
-										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
 											<span>쇼핑백 담기</span>
 										</button>
 									</div>
@@ -290,6 +290,15 @@
 										</div>
 									</th:block>
 									<!-- //리뷰사용가능, 리뷰등록전일때 -->
+									<!-- 리뷰사용불가능, 리뷰등록일때 -->
+									<th:block th:unless="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //리뷰사용가능, 리뷰등록전일때 -->
 								</div>
 							</th:block>
 							<!-- //구매확정 -->
@@ -322,7 +331,7 @@
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
 									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<div><button type="button" class="btn btn_primary btn_cart_save"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
 											<div><button type="button" class="btn btn_primary btn_review_write"><span>리뷰 쓰기</span></button></div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewCreateFormMob.html

@@ -268,7 +268,7 @@
 															<div class="form_field">
 																<div class="imgUpload">
 																	<label for="fileAdd" class="fileAdd" id="fileAdd_reply">첫번째업로드</label>
-																	<input type="file" id="fileAdd" name="files" accept=".jpeg, .jpg, .png, video/*"> <!-- 210507_추가 : accept 속성 추가 -->
+																	<input type="file" id="fileAdd" name="files" accept=".jpeg, .jpg, .png, video/mp4,video/x-m4v,video/*"> <!-- 210507_추가 : accept 속성 추가 -->
 																</div>
 															</div>
 															<!-- //이미지첨부 -->
@@ -602,6 +602,10 @@ $(function(){
 			$('#review_cnt').html("500");
 		}
 	});
+	
+	$('.doc_review').bind('input paste', function() {
+		  $(this).trigger('keyup');
+	});
 });
 
 $('#fileAdd').on('change', function() { fnChooseFile(this); });

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -147,7 +147,7 @@
 										<dt>할인 금액 차감</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreReturnDetailFormMob.html

@@ -207,7 +207,7 @@
 										<dt>할인 금액 차감</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberDeliveryInfoFormMob.html

@@ -103,7 +103,7 @@
 							<!-- 입금대기 (1:1문의, 쇼핑백 담기) -->
 							<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 								<div class="goods_btn_wrap btn_group_flex">
-									<div><button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+									<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 								</div>
 							</th:block>
 							<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
@@ -158,7 +158,7 @@
 							<!-- 구매확정 -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
 								<div class="goods_btn_wrap btn_group_flex">
-									<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+									<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 								</div>
 							</th:block>
 							<!-- //구매확정 -->

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -114,7 +114,7 @@
 								<!-- 입금대기 (1:1문의, 쇼핑백 담기) -->
 								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
 								<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
@@ -212,7 +212,7 @@
 								<!-- 구매확정 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
 									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_primary btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
 								<!-- //구매확정 -->

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListInfoMob.html

@@ -78,7 +78,7 @@
 							<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
-										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
 											<span>쇼핑백 담기</span>
 										</button>
 									</div>
@@ -156,7 +156,7 @@
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
-										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
 											<span>쇼핑백 담기</span>
 										</button>
 									</div>

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -223,7 +223,7 @@
 	<input type="hidden" name="planSq" th:value="${planInfo.planSq}" />
 	<input type="hidden" name="pageSize" value="10" />
 </form>
-<script src="/ux/plugins/gaga/gaga.singlePaging.js"></script>
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 let review = [[${reviewInfo}]];
 let coupon = [[${couponInfo}]];
@@ -296,7 +296,7 @@ var fnSearchCallback = function (result) {
 	 $("#replyList").append(html);
 	 
 	// Create pagination
-	gagaPaging.createPagination(result.paging.pageable);
+	gagaPaging.createSinglePagination(result.paging.pageable);
 }
 
 // 댓글 삭제

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

@@ -1348,16 +1348,16 @@
 	}
     
 	
-	/* var doubleSubmitFlag = false;
-    function doubleSubmitCheck(){
+	var doubleSubmitFlag = false;
+    /* function doubleSubmitCheck(){
         if(doubleSubmitFlag){
             return doubleSubmitFlag;
         }else{
             doubleSubmitFlag = true;
             return false;
         }
-    }
-    */
+    } */
+    
      
 	//쿠폰 다운로드
 	var fnQuickCouponDown = function(obj){
@@ -1366,13 +1366,20 @@
 			cfnGoToPage(_PAGE_LOGIN);
 			return false;
 		}
-		//if(doubleSubmitCheck()) return;
+		
+		if (doubleSubmitFlag){
+			mcxDialog.alert("다운로드 중입니다.");
+			return false;
+		}
+		
+		doubleSubmitFlag = true;
 		let cpnId = obj;
-		gagajf.ajaxJsonSubmit('/mypage/quick/coupon/download', JSON.stringify({cpnId: cpnId}), fnQuickCouponCallBack, true);
+		gagajf.ajaxJsonSubmit('/mypage/quick/coupon/download', JSON.stringify({cpnId: cpnId}), fnQuickCouponCallBack);
 	}
 
 	// 쿠폰다운로드 콜백
 	var fnQuickCouponCallBack = function(result){
+		doubleSubmitFlag = false;
 		if (result.status == "200"){
 			$.each(result.couponList, function (idx, item) {
 				if (Number(item.custPubLimitQty) > 0){

src/main/webapp/WEB-INF/views/web/mypage/MypageCreCancelDetailFormWeb.html

@@ -147,7 +147,7 @@
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
-												<dd><em th:text="${#numbers.formatInteger((oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt) * -1, 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt) * -1, 1, 'COMMA')}"></em>원</dd>
 											</div>
 										</dl>
 									</td>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreReturnDetailFormWeb.html

@@ -211,7 +211,7 @@
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
-												<dd><em th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 										</dl>
 									</td>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreCancelDetailFormWeb.html

@@ -144,7 +144,7 @@
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
-												<dd><em th:text="${#numbers.formatInteger((oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt) * -1, 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt) * -1, 1, 'COMMA')}"></em>원</dd>
 											</div>
 										</dl>
 									</td>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreReturnDetailFormWeb.html

@@ -209,7 +209,7 @@
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
-												<dd><em th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfDelvCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 										</dl>
 									</td>

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -1157,6 +1157,10 @@ $(document).ready( function() {
 		}
 	});
 	
+	$('.cmt_ans').bind('input paste', function() {
+		  $(this).trigger('keyup');
+	});
+	
 
 });
 </script>

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -133,7 +133,7 @@
 						$.each(result, function(idx, item) {
 						    tag += '  <div class="exhi_item">\n';
 						    tag += '       <div class="exhi_item_img">\n';
-						    tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\',\'' + [[${brandGroupNo}]] + '\')">\n';
+						    tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">\n';
                             if (item.newYn == 'Y') {
 						    	tag += '				<div class="shape ranker"><span>NEW</span></div>\n';
 						    }

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

@@ -66,7 +66,7 @@ var gagaPaging = {
 	},
 	
 	/**
-	 * Create a pagination
+	 * Create a pagination 
 	 * @param pageable - page 정보
 	 */
 	createPagination : function(pageable) {
@@ -82,6 +82,24 @@ var gagaPaging = {
 		gagaPaging.bind();
 	},
 	
+	/**
+	 * Create a pagination (모바일용)
+	 * @param pageable - page 정보
+	 */
+	createSinglePagination : function(pageable) {
+		// Generate pagination
+		var html;
+		if (gagajf.isNull(pageable.generatedSinglePagination)) {
+			html = gagaPaging.generatedSinglePagination(pageable);
+		} else {
+			html = pageable.generatedSinglePagination;
+		}
+		
+		$('#' + oPaginationId).html(html);
+		// Bind event
+		gagaPaging.bind();
+	},
+	
 	/**
 	 * Bind the pagination's event
 	 * Paging 처리 시 다음과 같이 지정
@@ -221,6 +239,59 @@ var gagaPaging = {
 
 		return pageTag;
 	}
+	
+	,generatedSinglePagination : function (pageable) {
+		let pageNo = pageable.pageNo;
+		let pageSize = pageable.pageSize;
+		let pageUnit = pageable.pageUnit;
+		let totalCount = pageable.totalCount;
+		let firstCount = (getPageGroup() - 1) * pageable.pageUnit + 1;
+		let loopCount = firstCount + pageUnit;
+		
+		
+		if (loopCount > getTotalPage()) {
+			loopCount = Number(getTotalPage() + 1);
+		}
+		
+		let pageTag = '';
+		if (!(firstCount == 1 && loopCount == 1)) {
+			
+			if (getPageGroup() == 1) {
+				if (pageNo == 1) {
+					pageTag += '<li class="prev disabled"><a href="#"><span class="sr-only">이전</span></a></li>\n';
+				} else {
+					pageTag += '<li class="prev"><a href="#pageNo='+ (pageNo-1) +'"><span class="sr-only">이전</span></a></li>\n';
+				}
+			} else {
+				pageTag += '<li class="prev"><a href="#pageNo='+ (pageNo-1) +'"><span class="sr-only">이전</span></a></li>\n';
+			}
+			
+			pageTag += '<li class="active">' + pageNo + '</li>\n';
+			pageTag += '<li>/</li>\n';
+			pageTag += '<li>' + getTotalPage() + '</li>\n';
+			
+			if(pageNo == Number(getTotalPage())) {
+				pageTag += '<li class="next disabled"><a href="#pageNo=' + getTotalPage() + '" alt="다음페이지"><span class="sr-only">다음</span></a></li>\n';
+			}else {
+				pageTag += '<li class="next"><a href="#pageNo='+ (pageNo+1) +'" alt="다음페이지"><span class="sr-only">다음</span></a></li>\n';
+			}
+			
+		}
+
+		function getPageGroup() {
+			return parseInt((pageNo-1) / pageUnit + 1 );
+		}
+
+		function getTotalPage() {
+			let totalPage = parseInt(totalCount / pageSize);
+			if (totalCount % pageSize > 0) {
+				totalPage++;
+			}
+			return totalPage;
+		}
+
+		return pageTag;
+	}
 
 }
 

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

@@ -1,220 +0,0 @@
-/*
- * Pagination Common Java Script written by gagamel.
- *
- * Copyright (c) 2019 gagamel
- * Dual licensed under GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2019-07-21 $
- * 
- * 사용 예)
- * 		// HTML 태그는 다음과 같은 구조로 되어 있어야 한다.
- * 		<div class="tablePaging" id="pagination">
- * 			<li class="prev"><a href="#"><span class="sr-only">이전</span></a></li>
- *			<li class="active">01</li>
- *			<li>/</li>
- *			<li>10</li>
- *			<li class="next"><a href="#"><span class="sr-only">다음</span></a></li>
- * 			...
- * 		</div>
- * 
- * 		// Import할 자바스크립트 파일
- * 		<script type="text/javascript" src="/ux/plugins/gaga/gaga.singlePaging"></script>
- * 
- * 		<script type="text/javascript">
- * 			// Initialize a pagination
- * 			gagaPaging.init('searchForm', fnSearchGoodsQnaCallback, 'pagination');
- * 			
- *			// Load data
- * 			gagaPaging.load($('#searchForm input[name=pageNo]').val(), $('#searchForm select[name=pageSize]').val());
- * 
- * 			var fnSearchGoodsQnaCallback = function(result) {
- * 				// Handle Data
- * 				...
- * 				
- * 				// Create pagination
- * 				gagaPaging.createPagination(result.goodsAsk.pageable);
- * 			}
- *		</script>
- */
-
-var gagaPaging = {
-
-	oFormId : '',
-	oCallbackFn : '',
-	oPaginationId : '',
-	nPageSize : 50,
-	nPageUnit : 10,
-	
-	/**
-	 * Initialize a pagination
-	 * @param formId - Form ID. 검색조건 폼 ID
-	 * @param callbackFn - Callback function. 데이터 조회 후 처리하는 콜백함수
-	 * @param paginationId - Pagination ID. 페이징을 구성하는 div 태그 ID
-	 * @param pageSize - 조회할 데이터 row수. 옵션
-	 * @param pageUnit - 그룹핑 페이지 단위. 옵션
-	 * 사용 예)
-	 * 		// Initialize a pagination
-	 * 		gagaPaging.init('searchForm', fnSearchGoodsQnaCallback, 'pagination');
-	 * 		or
-	 * 		gagaPaging.init('searchForm', fnSearchGoodsQnaCallback, 'pagination', 50);
-	 * 		or
-	 * 		gagaPaging.init('searchForm', fnSearchGoodsQnaCallback, 'pagination', 50, 10);
-	 */
-	init : function(formId, callbackFn, paginationId, pageSize, pageUnit) {
-		oFormId = formId;
-		oCallbackFn = callbackFn;
-		oPaginationId = paginationId;
-		if (typeof(pageSize) != 'undefined') nPageSize = pageSize;
-		if (typeof(pageUnit) != 'undefined') nPageUnit = pageUnit;
-	},
-	
-	/**
-	 * Create a pagination
-	 * @param pageable - page 정보
-	 */
-	createPagination : function(pageable) {
-		// Generate pagination
-		var html;
-		if (gagajf.isNull(pageable.generatedPagination)) {
-			html = gagaPaging.generatedPagination(pageable);
-		} else {
-			html = pageable.generatedPagination;
-		}
-		$('#' + oPaginationId).html(html);
-		// Bind event
-		gagaPaging.bind();
-	},
-	
-	/**
-	 * Bind the pagination's event
-	 * Paging 처리 시 다음과 같이 지정
-	 * 사용 예)
-	 * 		// HTML 태그는 다음과 같은 구조로 되어 있어야 한다.
-	 * 		<div class="tablePaging" id="pagination">
-	 * 			<a href="#pageNo=1">1</a>
-	 * 			<a href="#pageNo=2">2</a>
-	 * 			...
-	 * 		</div>
-	 */
-	bind : function() {
-		$('#' + oPaginationId + ' a').on('click', function(e) {
-			var params = $(this).attr('href');
-			params = params.replace(/^.*#/, '');
-			
-			var pageNo = 1;
-			
-			if (!gagajf.isNull(params)) {
-				pageNo = params.split("=")[1];
-			}
-			
-			gagaPaging.load(pageNo);
-			
-			return false;
-		});
-	},
-	
-	/**
-	 * Load data and call a callback function
-	 * JSON 형태로 보내고 받는 후 콜백함수에서 데이터를 처리한다.
-	 * @param pageNo - 조회할 페이지번호
-	 */
-	load : function(pageNo) {
-		$('#' + oFormId + ' input[name=pageNo]').val(pageNo);
-		$('#' + oFormId + ' input[name=pageSize]').val(nPageSize);
-		
-		// comma(,) 제거
-		gagajf.removeCommaAtNumberFormattedInput('#' + oFormId);
-		var jsonData = JSON.stringify($('#' + oFormId).serializeObject());
-		
-		$.ajax({
-			type : 'POST',
-			url : $('#' + oFormId).prop('action'),
-			data : jsonData,
-			dataType : 'JSON',
-			beforeSend : function(xhr, settings) {
-				// dataType: "json"일 때
-				xhr.setRequestHeader('Accept', 'application/json');
-				xhr.setRequestHeader('Content-Type', 'application/json');
-				
-				// Button disabled & progressBar creation
-				//gagajf.showProgressbar(true);
-			},
-			complete : function() {
-				// Button abled & progressBar remove
-				//gagajf.showProgressbar(false);
-			},
-			success : function(result) {
-				try {
-					if (!gagajf.isNull(result.error.message)) {
-						mcxDialog.alert(result.error.message);
-						return;
-					}
-				} catch(e) {
-					// Do nothing
-				}
-				
-				if (typeof(oCallbackFn) == 'function') {
-					oCallbackFn.call(this, result);
-				}
-			},
-			error : function(result) {
-				mcxDialog.alert('오류로 인해 처리되지 않았습니다.');
-			}
-		});
-	},
-	
-	generatedPagination : function (pageable) {
-		let pageNo = pageable.pageNo;
-		let pageSize = pageable.pageSize;
-		let pageUnit = pageable.pageUnit;
-		let totalCount = pageable.totalCount;
-		let firstCount = (getPageGroup() - 1) * pageable.pageUnit + 1;
-		let loopCount = firstCount + pageUnit;
-		
-		
-		if (loopCount > getTotalPage()) {
-			loopCount = Number(getTotalPage() + 1);
-		}
-		
-		let pageTag = '';
-		if (!(firstCount == 1 && loopCount == 1)) {
-			
-			if (getPageGroup() == 1) {
-				if (pageNo == 1) {
-					pageTag += '<li class="prev disabled"><a href="#"><span class="sr-only">이전</span></a></li>\n';
-				} else {
-					pageTag += '<li class="prev"><a href="#pageNo='+ (pageNo-1) +'"><span class="sr-only">이전</span></a></li>\n';
-				}
-			} else {
-				pageTag += '<li class="prev"><a href="#pageNo='+ (pageNo-1) +'"><span class="sr-only">이전</span></a></li>\n';
-			}
-			
-			pageTag += '<li class="active">' + pageNo + '</li>\n';
-			pageTag += '<li>/</li>\n';
-			pageTag += '<li>' + getTotalPage() + '</li>\n';
-			
-			if(pageNo == Number(getTotalPage())) {
-				pageTag += '<li class="next disabled"><a href="#pageNo=' + getTotalPage() + '" alt="다음페이지"><span class="sr-only">다음</span></a></li>\n';
-			}else {
-				pageTag += '<li class="next"><a href="#pageNo='+ (pageNo+1) +'" alt="다음페이지"><span class="sr-only">다음</span></a></li>\n';
-			}
-			
-		}
-
-		function getPageGroup() {
-			return parseInt((pageNo-1) / pageUnit + 1 );
-		}
-
-		function getTotalPage() {
-			let totalPage = parseInt(totalCount / pageSize);
-			if (totalCount % pageSize > 0) {
-				totalPage++;
-			}
-			return totalPage;
-		}
-
-		return pageTag;
-	}
-
-}
-