diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java index 5ba0efc5..ad834dea 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java @@ -843,6 +843,7 @@ public class BOMaSopmalService { mapping.put("memor", "MEMOR_USE_AT"); mapping.put("npay", "NPAY_USE_AT"); mapping.put("kpay", "KPAY_USE_AT"); + mapping.put("stripe", "STRIPE_USE_AT"); // 모든 매핑된 값의 기본값을 "N"으로 설정 for (String key : mapping.values()) { diff --git a/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml b/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml index c8cc042b..ead48bf7 100644 --- a/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml @@ -338,6 +338,7 @@ ,MEMOR_USE_AT ,NPAY_USE_AT ,KPAY_USE_AT + ,STRIPE_USE_AT FROM GC_PAY_INFO WHERE SETLE_SETUP_INNB = #{setleSetupInnb} @@ -1281,6 +1282,7 @@ MEMOR_USE_AT = #{memorUseAt}, NPAY_USE_AT = #{npayUseAt}, KPAY_USE_AT = #{kpayUseAt}, + STRIPE_USE_AT = #{stripeUseAt}, UPDUSR = #{updusr}, UPDT_DT = NOW() WHERE diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml index 67c512b8..5a71b338 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml @@ -2654,6 +2654,7 @@ FROM ( , FPI.TPAY_USE_AT , FPI.NPAY_USE_AT , FPI.KPAY_USE_AT + , FPI.STRIPE_USE_AT , FPI.MEMOR_USE_AT , FPL.KCP_MID , FPL.KCP_CLNT_KEY diff --git a/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalU.jsp b/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalU.jsp index 418180fb..044a4e2d 100644 --- a/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalU.jsp +++ b/src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalU.jsp @@ -1497,6 +1497,11 @@ 카카오페이 + @@ -1573,6 +1578,11 @@ 카카오페이 + @@ -1649,6 +1659,11 @@ 카카오페이 + @@ -1725,6 +1740,11 @@ 카카오페이 + diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index 0ca6fa9e..89d3d6d5 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -575,7 +575,6 @@ $(form).find('#setleTyCd').val('03'); } else if('st01' === id){ //Stripe - $(form).find('#setleTyCd').val('stripe'); $('.cartOrderBox__totalKr').hide(); } else { $(form).find('#setleTyCd').val(''); @@ -592,7 +591,8 @@ const useCashMlgAmt = $('#useCashMlgAmt').val(); //$('#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() === '03'){$('#pg06').click();} @@ -3034,7 +3034,7 @@ 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'); if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) { @@ -4244,12 +4244,19 @@ <%-- 퀵계좌이체 끝 --%> <%-- Stripe 시작 --%> -<%-- --%> +
-<%--
--%> + +
<%-- Stripe 끝 --%> <%-- toss 결제 시작 --%> diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp index 7d7519fd..6aaf74e4 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp @@ -531,6 +531,7 @@ $(form).find('.pgContent').hide(); $(form).find('#' + id + 'Content').show(); + $('.cartOrderBox__totalKr').show(); //$(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show(); if($(form).find('#setleSetupTyCd').val() === '01'){$(form).find('#pg04Content').show();} @@ -576,6 +577,8 @@ }); $(form).find('#setleTyCd').val('03'); + } else if('st01' === id){ //Stripe + $('.cartOrderBox__totalKr').hide(); } else { $(form).find('#setleTyCd').val(''); @@ -591,7 +594,8 @@ const useCashMlgAmt = $('#useCashMlgAmt').val(); //$('#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() === '03'){$('#pg06').click();} @@ -2998,7 +3002,7 @@ 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'); if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) { @@ -4205,6 +4209,22 @@ <%-- 퀵계좌이체 끝 --%> + <%-- Stripe 시작 --%> + +
+ + +
+ +
+ <%-- Stripe 끝 --%> + <%-- toss 결제 시작 --%>
@@ -4622,11 +4642,11 @@ (-)0${curUnit} -
+
총 결제금액 0${curUnit}
-
+
0${krUnit}