Stripe 결제 구분 적용
This commit is contained in:
@@ -843,6 +843,7 @@ public class BOMaSopmalService {
|
|||||||
mapping.put("memor", "MEMOR_USE_AT");
|
mapping.put("memor", "MEMOR_USE_AT");
|
||||||
mapping.put("npay", "NPAY_USE_AT");
|
mapping.put("npay", "NPAY_USE_AT");
|
||||||
mapping.put("kpay", "KPAY_USE_AT");
|
mapping.put("kpay", "KPAY_USE_AT");
|
||||||
|
mapping.put("stripe", "STRIPE_USE_AT");
|
||||||
|
|
||||||
// 모든 매핑된 값의 기본값을 "N"으로 설정
|
// 모든 매핑된 값의 기본값을 "N"으로 설정
|
||||||
for (String key : mapping.values()) {
|
for (String key : mapping.values()) {
|
||||||
|
|||||||
@@ -338,6 +338,7 @@
|
|||||||
,MEMOR_USE_AT
|
,MEMOR_USE_AT
|
||||||
,NPAY_USE_AT
|
,NPAY_USE_AT
|
||||||
,KPAY_USE_AT
|
,KPAY_USE_AT
|
||||||
|
,STRIPE_USE_AT
|
||||||
FROM GC_PAY_INFO
|
FROM GC_PAY_INFO
|
||||||
WHERE SETLE_SETUP_INNB = #{setleSetupInnb}
|
WHERE SETLE_SETUP_INNB = #{setleSetupInnb}
|
||||||
</select>
|
</select>
|
||||||
@@ -1281,6 +1282,7 @@
|
|||||||
MEMOR_USE_AT = #{memorUseAt},
|
MEMOR_USE_AT = #{memorUseAt},
|
||||||
NPAY_USE_AT = #{npayUseAt},
|
NPAY_USE_AT = #{npayUseAt},
|
||||||
KPAY_USE_AT = #{kpayUseAt},
|
KPAY_USE_AT = #{kpayUseAt},
|
||||||
|
STRIPE_USE_AT = #{stripeUseAt},
|
||||||
UPDUSR = #{updusr},
|
UPDUSR = #{updusr},
|
||||||
UPDT_DT = NOW()
|
UPDT_DT = NOW()
|
||||||
WHERE
|
WHERE
|
||||||
|
|||||||
@@ -2654,6 +2654,7 @@ FROM (
|
|||||||
, FPI.TPAY_USE_AT
|
, FPI.TPAY_USE_AT
|
||||||
, FPI.NPAY_USE_AT
|
, FPI.NPAY_USE_AT
|
||||||
, FPI.KPAY_USE_AT
|
, FPI.KPAY_USE_AT
|
||||||
|
, FPI.STRIPE_USE_AT
|
||||||
, FPI.MEMOR_USE_AT
|
, FPI.MEMOR_USE_AT
|
||||||
, FPL.KCP_MID
|
, FPL.KCP_MID
|
||||||
, FPL.KCP_CLNT_KEY
|
, FPL.KCP_CLNT_KEY
|
||||||
|
|||||||
@@ -1497,6 +1497,11 @@
|
|||||||
<span class="check"></span>
|
<span class="check"></span>
|
||||||
<span class="control-label">카카오페이</span>
|
<span class="control-label">카카오페이</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label class="b-checkbox checkbox">
|
||||||
|
<input type="checkbox" name="pc-setle-type" value="stripe" ${f:setChecked(fn:contains(payInfoList.stripeUseAt, 'Y'), true)} class="stripe">
|
||||||
|
<span class="check"></span>
|
||||||
|
<span class="control-label">Stripe</span>
|
||||||
|
</label>
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</c:if>
|
</c:if>
|
||||||
@@ -1573,6 +1578,11 @@
|
|||||||
<span class="check"></span>
|
<span class="check"></span>
|
||||||
<span class="control-label">카카오페이</span>
|
<span class="control-label">카카오페이</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label class="b-checkbox checkbox">
|
||||||
|
<input type="checkbox" name="mobile-setle-type" value="stripe" ${f:setChecked(fn:contains(payInfoList.stripeUseAt, 'Y'), true)} class="stripe">
|
||||||
|
<span class="check"></span>
|
||||||
|
<span class="control-label">Stripe</span>
|
||||||
|
</label>
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</c:if>
|
</c:if>
|
||||||
@@ -1649,6 +1659,11 @@
|
|||||||
<span class="check"></span>
|
<span class="check"></span>
|
||||||
<span class="control-label">카카오페이</span>
|
<span class="control-label">카카오페이</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label class="b-checkbox checkbox">
|
||||||
|
<input type="checkbox" name="pc-subsvc-setle-type" value="stripe" ${f:setChecked(fn:contains(payInfoList.stripeUseAt, 'Y'), true)} class="stripe">
|
||||||
|
<span class="check"></span>
|
||||||
|
<span class="control-label">Stripe</span>
|
||||||
|
</label>
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</c:if>
|
</c:if>
|
||||||
@@ -1725,6 +1740,11 @@
|
|||||||
<span class="check"></span>
|
<span class="check"></span>
|
||||||
<span class="control-label">카카오페이</span>
|
<span class="control-label">카카오페이</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label class="b-checkbox checkbox">
|
||||||
|
<input type="checkbox" name="mobile-subsvc-setle-type" value="stripe" ${f:setChecked(fn:contains(payInfoList.stripeUseAt, 'Y'), true)} class="stripe">
|
||||||
|
<span class="check"></span>
|
||||||
|
<span class="control-label">Stripe</span>
|
||||||
|
</label>
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
</c:if>
|
</c:if>
|
||||||
|
|||||||
@@ -575,7 +575,6 @@
|
|||||||
|
|
||||||
$(form).find('#setleTyCd').val('03');
|
$(form).find('#setleTyCd').val('03');
|
||||||
} else if('st01' === id){ //Stripe
|
} else if('st01' === id){ //Stripe
|
||||||
$(form).find('#setleTyCd').val('stripe');
|
|
||||||
$('.cartOrderBox__totalKr').hide();
|
$('.cartOrderBox__totalKr').hide();
|
||||||
} else {
|
} else {
|
||||||
$(form).find('#setleTyCd').val('');
|
$(form).find('#setleTyCd').val('');
|
||||||
@@ -592,7 +591,8 @@
|
|||||||
const useCashMlgAmt = $('#useCashMlgAmt').val();
|
const useCashMlgAmt = $('#useCashMlgAmt').val();
|
||||||
|
|
||||||
//$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
|
//$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
|
||||||
if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
|
if ($('#st01').is(':checked')){$('#st01').click();}
|
||||||
|
else if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
|
||||||
else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
|
else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
|
||||||
else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
|
else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
|
||||||
|
|
||||||
@@ -3034,7 +3034,7 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm) {
|
if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm || 'stripe' === pgCmpnyNm) {
|
||||||
const div = $('#setleForm').find('.order-method-normal');
|
const div = $('#setleForm').find('.order-method-normal');
|
||||||
|
|
||||||
if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
|
if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
|
||||||
@@ -4244,12 +4244,19 @@
|
|||||||
<%-- 퀵계좌이체 끝 --%>
|
<%-- 퀵계좌이체 끝 --%>
|
||||||
|
|
||||||
<%-- Stripe 시작 --%>
|
<%-- Stripe 시작 --%>
|
||||||
<%-- <c:if test="${'Y' eq payInfo.rltmAcntUseAt}">--%>
|
<c:if test="${'Y' eq payInfo.stripeUseAt}">
|
||||||
<div class="custom-radio is-medium">
|
<div class="custom-radio is-medium">
|
||||||
<input type="radio" name="pg" id="st01" value="stripe">
|
<input type="radio" name="pg" id="st01" value="stripe">
|
||||||
<label for="st01">엔화 결제</label>
|
<label for="st01">엔화 결제</label>
|
||||||
</div>
|
</div>
|
||||||
<%-- </c:if>--%>
|
<div id="st01Content" class="pgContent order-method-normal" <%-- style="display: none"--%>>
|
||||||
|
<div class="order-method-normal__btn-container">
|
||||||
|
<button type="button" name="01" id="stripe" class="order-method-normal__btn gift_pay">
|
||||||
|
<div class="order-method-normal__icon order-method-normal__icon--card"></div>신용카드
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</c:if>
|
||||||
<%-- Stripe 끝 --%>
|
<%-- Stripe 끝 --%>
|
||||||
|
|
||||||
<%-- toss 결제 시작 --%>
|
<%-- toss 결제 시작 --%>
|
||||||
|
|||||||
@@ -531,6 +531,7 @@
|
|||||||
|
|
||||||
$(form).find('.pgContent').hide();
|
$(form).find('.pgContent').hide();
|
||||||
$(form).find('#' + id + 'Content').show();
|
$(form).find('#' + id + 'Content').show();
|
||||||
|
$('.cartOrderBox__totalKr').show();
|
||||||
|
|
||||||
//$(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
|
//$(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
|
||||||
if($(form).find('#setleSetupTyCd').val() === '01'){$(form).find('#pg04Content').show();}
|
if($(form).find('#setleSetupTyCd').val() === '01'){$(form).find('#pg04Content').show();}
|
||||||
@@ -576,6 +577,8 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
$(form).find('#setleTyCd').val('03');
|
$(form).find('#setleTyCd').val('03');
|
||||||
|
} else if('st01' === id){ //Stripe
|
||||||
|
$('.cartOrderBox__totalKr').hide();
|
||||||
} else {
|
} else {
|
||||||
$(form).find('#setleTyCd').val('');
|
$(form).find('#setleTyCd').val('');
|
||||||
|
|
||||||
@@ -591,7 +594,8 @@
|
|||||||
const useCashMlgAmt = $('#useCashMlgAmt').val();
|
const useCashMlgAmt = $('#useCashMlgAmt').val();
|
||||||
|
|
||||||
//$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
|
//$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
|
||||||
if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
|
if ($('#st01').is(':checked')){$('#st01').click();}
|
||||||
|
else if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
|
||||||
else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
|
else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
|
||||||
else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
|
else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
|
||||||
|
|
||||||
@@ -2998,7 +3002,7 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm) {
|
if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm || 'stripe' === pgCmpnyNm) {
|
||||||
const div = $('#setleForm').find('.order-method-normal');
|
const div = $('#setleForm').find('.order-method-normal');
|
||||||
|
|
||||||
if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
|
if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
|
||||||
@@ -4205,6 +4209,22 @@
|
|||||||
</c:if>
|
</c:if>
|
||||||
<%-- 퀵계좌이체 끝 --%>
|
<%-- 퀵계좌이체 끝 --%>
|
||||||
|
|
||||||
|
<%-- Stripe 시작 --%>
|
||||||
|
<c:if test="${'Y' eq payInfo.stripeUseAt}">
|
||||||
|
<div class="custom-radio is-medium">
|
||||||
|
<input type="radio" name="pg" id="st01" value="stripe">
|
||||||
|
<label for="st01">엔화 결제</label>
|
||||||
|
</div>
|
||||||
|
<div id="st01Content" class="pgContent order-method-normal" <%-- style="display: none"--%>>
|
||||||
|
<div class="order-method-normal__btn-container">
|
||||||
|
<button type="button" name="01" id="stripe" class="order-method-normal__btn gift_pay">
|
||||||
|
<div class="order-method-normal__icon order-method-normal__icon--card"></div>신용카드
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</c:if>
|
||||||
|
<%-- Stripe 끝 --%>
|
||||||
|
|
||||||
<%-- toss 결제 시작 --%>
|
<%-- toss 결제 시작 --%>
|
||||||
<c:if test="${'02' eq payInfo.setleSetupTyCd}">
|
<c:if test="${'02' eq payInfo.setleSetupTyCd}">
|
||||||
<div class="custom-radio is-medium">
|
<div class="custom-radio is-medium">
|
||||||
@@ -4622,11 +4642,11 @@
|
|||||||
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span id="dscntAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
|
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span id="dscntAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="cartOrderBox__total" style="margin-bottom: 5px;">
|
<div class="cartOrderBox__total">
|
||||||
<span class="cartOrderBox__totalTh">총 결제금액</span>
|
<span class="cartOrderBox__totalTh">총 결제금액</span>
|
||||||
<span class="cartOrderBox__td"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
|
<span class="cartOrderBox__td"><span id="setleAmtSapn" class="comma">0</span><span class="priceUnit">${curUnit}</span></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="cartOrderBox__total" style="margin-top: 5px;">
|
<div class="cartOrderBox__total cartOrderBox__totalKr" style="margin-top: 10px;">
|
||||||
<span class="cartOrderBox__totalTh"></span>
|
<span class="cartOrderBox__totalTh"></span>
|
||||||
<span class="cartOrderBox__totalTd"><span id="setleAmtKrSapn" class="comma">0</span><span class="priceUnit">${krUnit}</span></span>
|
<span class="cartOrderBox__totalTd"><span id="setleAmtKrSapn" class="comma">0</span><span class="priceUnit">${krUnit}</span></span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user