Merge branch 'yujung_style' into develop

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -957,7 +957,8 @@ public class TsfOrderService {
 
 		// 현금영수증 정보
 		c_PayPlus.mf_set_us( rcpt_data_set, "user_type", "PGNW") ;
-		c_PayPlus.mf_set_us( rcpt_data_set, "trad_time", param.getTradeTime()) ;
+//		c_PayPlus.mf_set_us( rcpt_data_set, "trad_time", param.getTradeTime()) ; 2021.10.12 상품권 현금영수증 신청 시 당일 날짜 변경으로 아래 사용
+		c_PayPlus.mf_set_us( rcpt_data_set, "trad_time", param.getNowTime()) ;
 		c_PayPlus.mf_set_us( rcpt_data_set, "tr_code"  , "0") ;							// 0 : 소득공제용(개인), 1 : 지출증빙용(기업)
 		c_PayPlus.mf_set_us( rcpt_data_set, "id_info"  , ordPhnno) ;							// 발급 대상이 개인인 경우에는 주민번호, 휴대폰번호,현금영수증 카드를 세팅하며, 기업인 경우에는 대상 사업자 번호를 입력. 자진발급으로 등록 시, “0100001234” 으로 입력.
 		c_PayPlus.mf_set_us( rcpt_data_set, "amt_tot"  , param.getUsGfcdAmt() + "") ;	// 현금영수증 금액 (공급가액 + 부가가치세 + 봉사료)

src/main/java/com/style24/front/biz/web/TsfIndexController.java

@@ -120,10 +120,11 @@ public class TsfIndexController extends TsfBaseController {
 
 		mav.addObject("front", env.getProperty("domain.front"));
 		mav.addObject("sitekey", env.getProperty("google.sitekey"));
+		mav.addObject("ipAddress", TsfSession.getIpAddress());
 
-		// 로그인 페이지로
 		mav.setViewName(super.getDeviceViewName("SigninForm"));
 
+
 		return mav;
 	}
 

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

@@ -219,6 +219,7 @@
 		/* TsfGiftcard.getCashReceiptsInfo */
 		SELECT O.ORD_NO
 		     , DATE_FORMAT(O.ORD_DT, '%Y%m%d%H%i%S') AS TRADE_TIME
+		     , DATE_FORMAT(NOW(), '%Y%m%d%H%i%S')    AS NOW_TIME
 		     , O.ORD_NM
 		     , O.ORD_PHNNO
 		     , O.ORD_EMAIL

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -77,7 +77,7 @@
 					<h3 class="sr-only">간편로그인</h3>
 					<ul class="login_utill">
 						<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
-						<th:block th:if="false">
+						<th:block th:if="${ipAddress == '180.71.39.150' || ipAddress == '127.0.0.1'}">
 						<li class="lu_kakao">
 							<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 								<div class="ico"></div>카카오

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

@@ -765,7 +765,9 @@
 					</table>
 					<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
 					<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and not #strings.isEmpty(paymentInfo.cashAuthNo) and (paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20')}" onclick="fnReceipt('cash')"><span>현금 영수증</span></button>
+<!--					<th:block th:if="${#numbers.formatInteger(#calendars.format(#calendars.createNow(), 'yyyyMMdd'), 1)} - ${#numbers.formatInteger(#strings.replace(oneData.ordDt, '.', ''), 1)} < 90">-->
 					<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and (cashReceiptsInfo == null or #strings.isEmpty(cashReceiptsInfo.authNo))}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
+<!--					</th:block>-->
 					<!-- 
 					<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and #strings.isEmpty(paymentInfo.cashAuthNo)}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
 					 -->

src/main/webapp/WEB-INF/views/web/SigninFormWeb.html

@@ -81,7 +81,7 @@
 						<h5 class="sr-only">간편로그인</h5>
 						<ul>
 							<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
-							<th:block th:if="false">
+							<th:block th:if="${ipAddress == '180.71.39.150' || ipAddress == '127.0.0.1'}">
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 									<i class="ico ico_snslogin kakao"></i>

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

@@ -473,7 +473,9 @@
 													<dd>
 														<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
 														<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and not #strings.isEmpty(paymentInfo.cashAuthNo) and (paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20')}" onclick="fnReceipt('cash')"><span>현금 영수증</span></button>
-														<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and (cashReceiptsInfo == null or #strings.isEmpty(cashReceiptsInfo.authNo))}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
+<!--														<th:block th:if="${#numbers.formatInteger(#calendars.format(#calendars.createNow(), 'yyyyMMdd'), 1)} - ${#numbers.formatInteger(#strings.replace(oneData.ordDt, '.', ''), 1)} < 90">-->
+															<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and (cashReceiptsInfo == null or #strings.isEmpty(cashReceiptsInfo.authNo))}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
+<!--														</th:block>-->
 													</dd>
 												</div>
 											</dl>