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 399e22f1..8ceed66f 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -590,7 +590,7 @@ //$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click(); if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();} else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();} - else if($('#setleSetupTyCd').val() === '03'){$('#pg05').click();} + else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();} $('.order-method-normal__btn').removeClass('active'); $(this).addClass('active'); @@ -3542,94 +3542,9 @@ diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp index 13c37e47..c3a43453 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKiwoomPayR.jsp @@ -29,14 +29,16 @@ @@ -137,7 +140,7 @@ <%-- 상점아이디 개발:CTS18056 / 운영:CFO20585,CFO20586--%> - <%-- 결제방식(P:PC/M:모바일/W:웹뷰) --%> + <%-- 결제방식(P:PC/M:모바일/W:웹뷰) 스킨환경코드(P:PC, M:mobile, TM:TM주문)--%> <%-- 결제수단 (CARD:카드/NAVERPAY:네이버페이)--%> <%-- 과세 비과세 여부(00: 과세, 01: 비과세, 02: 복합과세) --%> <%-- 과금 유형(1: 일반) --%> diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp index e7e996c9..3af0a14c 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp @@ -39,8 +39,14 @@ // gcpay 사용안할 경우 기본 세팅 const gcpayCardUseAt = $('#gcpayCardUseAt').val(); let gcpayAt = ( gcpayCardUseAt === 'Y')? 'Y' : 'N'; - const setleTy = $('#setleSetupTyCd').val(); //01:kcp, 02:toss - const setleTyCd = (setleTy==='01')?'#pg04':'#pg03'; + const setleTy = $('#setleSetupTyCd').val(); + //const setleTyCd = (setleTy==='01')?'#pg04':'#pg03'; + + let setleTyCd = '#pg04'; + if(setleTy==='01')setleTyCd = '#pg04'; //kcp + else if(setleTy==='02')setleTyCd = '#pg03'; //toss + else if(setleTy==='03')setleTyCd = '#pg06'; //kiwoom + if (gcpayAt === 'N') { $(setleTyCd).click(); } @@ -566,7 +572,13 @@ $(form).find('.pgContent').hide(); $(form).find('#' + id + 'Content').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();} + else if($(form).find('#setleSetupTyCd').val() === '02'){$(form).find('#pg03Content').show();} + else if($(form).find('#setleSetupTyCd').val() === '03'){$(form).find('#pg06Content').show();} + + $('.order-method-normal__btn').removeClass('active'); $(form).find('#pgCmpnyNm').val(pgCmpnyNm); @@ -621,7 +633,10 @@ const content = $('.order-method-normal__content'); const useCashMlgAmt = $('#useCashMlgAmt').val(); - $('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click(); + //$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click(); + if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();} + else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();} + else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();} $('.order-method-normal__btn').removeClass('active'); $(this).addClass('active'); @@ -3084,7 +3099,7 @@ return false; } - if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm) { + if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm) { const div = $('#setleForm').find('.order-method-normal'); if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) { @@ -3125,7 +3140,13 @@ const id = '01' === issuTrgetDvCd ? 'issuTrgetMbtlnb' : 'issuTrgetBsnmNb'; let rlPgCmpnyNm = $('#pgCmpnyNm').val(); - let setleTyId = $('kcp' === pgCmpnyNm ? '#pg04Content' : '#pg03Content').find('button[name="' + setleTyCd + '"]').attr('id'); + //let setleTyId = $('kcp' === pgCmpnyNm ? '#pg04Content' : '#pg03Content').find('button[name="' + setleTyCd + '"]').attr('id'); + + let pgCont = ""; + if('kiwoom' === pgCmpnyNm) pgCont='pg06Content'; + else if('kcp' === pgCmpnyNm) pgCont='pg04Content'; + else pgCont='pg03Content'; + let setleTyId = $('#'+pgCont).find('button[name="' + setleTyCd + '"]').attr('id'); if ('tosspay' === rlPgCmpnyNm) { setleTyId = 'acount' @@ -3594,6 +3615,13 @@ }); } + +