diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java index a1049d3e..30a447ff 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java @@ -46,10 +46,14 @@ public class BOOrdrRefundVO extends AbstractVO { private BigDecimal refundAmt; // 환불금액 + private BigDecimal wonRefundAmt; // 환불금액(원화) + private BigDecimal refundAccmlmnyAmt; // 환불적립금액 private BigDecimal refundDlvyAmt; // 환불배송비총금액 + private BigDecimal wonRefundDlvyAmt; // 환불배송비총금액(원화) + private BigDecimal mlgAccmlmnyAmt; // 적립금보정금액 private String mlgAccmlmnyValidDt; // 적립금유효기간 @@ -122,6 +126,8 @@ public class BOOrdrRefundVO extends AbstractVO { private BigDecimal dlvyAmtRefundAmt; // 배송비환불금액 + private BigDecimal wonDlvyAmtRefundAmt; // 배송비환불금액(원화) + private BigDecimal dlvyAmtRefundMlgAmt; // 배송비환불마일리지금액 private String secretKey; diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml index a947f047..c2bea70c 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml @@ -1652,8 +1652,10 @@ , REFUND_ACNT_DPSTR_NM , REFUND_ACNTNB , REFUND_AMT + , WON_REFUND_AMT , REFUND_ACCMLMNY_AMT , REFUND_DLVY_AMT + , WON_REFUND_DLVY_AMT , MLG_ACCMLMNY_AMT , MLG_ACCMLMNY_VALID_DT , ENURI_REVISN_AMT @@ -1695,6 +1697,7 @@ , MNGR_MEMO_CN , MNGR_INNB , DLVY_AMT_REFUND_AMT + , WON_DLVY_AMT_REFUND_AMT , DLVY_AMT_REFUND_MLG_AMT , USE_AT , REGIST_DT @@ -1716,8 +1719,10 @@ , #{refundAcntDpstrNm} , REPLACE(#{refundAcntnb}, '-', '') , #{refundAmt} + , #{wonRefundAmt} , #{refundAccmlmnyAmt} , #{refundDlvyAmt} + , #{wonRefundDlvyAmt} , #{mlgAccmlmnyAmt} , #{mlgAccmlmnyValidDt} , #{enuriRevisnAmt} @@ -1759,6 +1764,7 @@ , #{mngrMemoCn} , #{mngrInnb} , #{dlvyAmtRefundAmt} + , #{wonDlvyAmtRefundAmt} , #{dlvyAmtRefundMlgAmt} , 'Y' , SYSDATE() diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp index 31790a40..e6f4b185 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp @@ -192,9 +192,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -319,9 +319,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -369,9 +369,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -409,9 +409,9 @@ }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -482,8 +482,8 @@ // fn_move_dtlupdt(parsedResult.dlivyInnb); }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp index 9e851dc7..cee8f1c0 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp @@ -612,9 +612,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -643,9 +643,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -663,9 +663,9 @@ if (data.resBody != null) {} }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -693,9 +693,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -1570,7 +1570,8 @@ }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; + alert(message) } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp index 3229cc2b..d645b6db 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp @@ -898,7 +898,8 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } @@ -1010,7 +1011,8 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } @@ -1101,7 +1103,8 @@ }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp index 5f3d47ca..c714824c 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp @@ -251,9 +251,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -284,9 +284,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp index d3b101cc..92f41bbd 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp @@ -636,9 +636,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -666,9 +666,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -686,9 +686,9 @@ if (data.resBody != null) {} }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -718,9 +718,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp index 85016b25..3c614adb 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp @@ -89,9 +89,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp index d41e8c53..5755536c 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp @@ -586,9 +586,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -613,9 +613,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -633,9 +633,9 @@ if (data.resBody != null) {} }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -663,9 +663,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp index d2b1e78a..f22354d7 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp @@ -586,9 +586,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -613,9 +613,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -633,9 +633,9 @@ if (data.resBody != null) {} }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -663,9 +663,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp index adbdbc46..d95439a4 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp @@ -834,9 +834,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -866,9 +866,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -914,9 +914,9 @@ }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -1573,9 +1573,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp index e1375c32..0fbfb8ae 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp @@ -1170,8 +1170,8 @@ location.reload(); } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp b/src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp index dd85c690..484dc3f2 100644 --- a/src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp @@ -1145,9 +1145,9 @@ since : 2024.01.04 추지훈 최초 생성 } } }/*, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); }*/ }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp index 0a53bfc4..d0f09ef6 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp @@ -536,9 +536,9 @@ $('#pageDiv').html(html); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -559,9 +559,9 @@ $('#subsvcPageDiv').html(html); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -587,9 +587,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -615,9 +615,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -738,9 +738,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -789,9 +789,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -849,9 +849,9 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp index c99ac16f..53921e72 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp @@ -64,9 +64,9 @@ $('#pageDiv').html(html); }, error: function(data) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp index 6c842ee8..06508aec 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp @@ -542,9 +542,9 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -572,9 +572,9 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -653,9 +653,9 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnSetleCancl").prop("disabled",false); } }); @@ -702,9 +702,9 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -773,9 +773,9 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnReturnRegist").prop("disabled",false); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp index 57fd3d26..51c35d7a 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp @@ -557,9 +557,9 @@ $('#pageDiv').html(html); }, error:function (data) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -587,9 +587,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -619,9 +619,9 @@ fn_mpage_info_refresh(); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -743,9 +743,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -814,8 +814,8 @@ $('#btnSetleCancl').prop('disabled', false); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); $('#btnSetleCancl').prop('disabled', false); } }).done( function (data) { @@ -899,8 +899,8 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); $('#btnReturnRegist').prop('disabled', false); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index cc7b4bb2..f702c1fa 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -23,6 +23,7 @@ <%-- 공통 include --%> + @@ -96,6 +97,12 @@ const checkLength = $(row).find('input[name="goodsCheck"]:checked').length; + /** 결제 확인상태인 경우 전체취소 불가*/ + if ('${order.ordrSttusCd}' == '25'){ + alert('결제확인 상태에서는 전체 취소만 가능합니다.'); + return false; + } + if (checkLength === 0) { alert('결제취소/환불 하실 상품을 선택해 주십시요.'); @@ -602,9 +609,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -631,9 +638,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -707,9 +714,10 @@ $("#btnSetleCancl").prop("disabled",true); }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + console.log(request); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnSetleCancl").prop("disabled",true); } }).done( function (data) { @@ -760,9 +768,9 @@ location.reload(); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -826,9 +834,9 @@ $("#btnReturnRegist").prop("disabled",false); }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnReturnRegist").prop("disabled",false); } }); @@ -1122,7 +1130,6 @@ <%-- 마이페이지 Right 영역 --%> -
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp index 0de484b2..3476d80f 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -556,9 +556,9 @@ $('#pageDiv').html(html); }, error:function (data) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -586,9 +586,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -618,9 +618,9 @@ fn_mpage_info_refresh(); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -742,9 +742,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -813,8 +813,8 @@ $('#btnSetleCancl').prop('disabled', false); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); $('#btnSetleCancl').prop('disabled', false); } }).done( function (data) { @@ -898,8 +898,8 @@ } }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); $('#btnReturnRegist').prop('disabled', false); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp index 90ad000e..35baaa55 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -601,9 +601,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -630,9 +630,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -706,9 +706,9 @@ $("#btnSetleCancl").prop("disabled",true); }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnSetleCancl").prop("disabled",true); } }).done( function (data) { @@ -759,9 +759,9 @@ location.reload(); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -825,9 +825,9 @@ $("#btnReturnRegist").prop("disabled",false); }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnReturnRegist").prop("disabled",false); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GiftListFormR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GiftListFormR.jsp index d8342210..f6b22d13 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GiftListFormR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GiftListFormR.jsp @@ -114,9 +114,9 @@ loading.remove(); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); loading.remove(); } @@ -249,9 +249,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -301,9 +301,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -654,8 +654,8 @@ onSuccess(); }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/IndvdlSetleR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/IndvdlSetleR.jsp index 5c833695..f7b56727 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/IndvdlSetleR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/IndvdlSetleR.jsp @@ -56,9 +56,9 @@ loading.remove(); }, error: function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); loading.remove(); } @@ -93,9 +93,9 @@ loading.remove(); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); loading.remove(); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/NmbrOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/NmbrOrdrDtlR.jsp index 2d1d178f..49a3c0af 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/NmbrOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/NmbrOrdrDtlR.jsp @@ -109,9 +109,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -158,9 +158,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -259,8 +259,8 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - $("#message.errorMsg").text(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + $("#message.errorMsg").text(message); openModal2("custom_alert") } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp index 0d4565f1..067176aa 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp @@ -115,9 +115,9 @@ loading.remove(); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); loading.remove(); } @@ -290,9 +290,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -345,9 +345,9 @@ fn_get_ordr_dlvy_list(1); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -705,8 +705,8 @@ onSuccess(); }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp index f8155325..e432874f 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp @@ -107,9 +107,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -159,9 +159,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -292,8 +292,8 @@ onSuccess(); }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp index 459695ad..2bda25f1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrSetleCanclPopup.jsp @@ -286,9 +286,9 @@ $("#btnSetleCancl").prop('disabled',false); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnSetleCancl").prop('disabled',false); } }).done( function (data) { diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RefundRegistPopupC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RefundRegistPopupC.jsp index 9201d0e5..d433c70b 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RefundRegistPopupC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/RefundRegistPopupC.jsp @@ -385,9 +385,9 @@ $("#btnReturnRegist").prop("disabled",false); }, error : function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); $("#btnReturnRegist").prop("disabled",false); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp index bb11b223..b81ceda7 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -115,9 +115,9 @@ loading.remove(); }, error:function (request) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); loading.remove(); } @@ -291,9 +291,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -346,9 +346,9 @@ fn_get_ordr_dlvy_list(1); }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -706,8 +706,8 @@ onSuccess(); }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp index af247f38..83089c17 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -107,9 +107,9 @@ } }, error:function(request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -159,9 +159,9 @@ } }, error:function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); + let message = JSON.parse(request.responseText).resBody.result; - alert(message.errorMsg); + alert(message); } }); } @@ -302,8 +302,8 @@ } }, error: function (request, status, error) { - let message = JSON.parse(JSON.parse(request.responseText).resBody.message); - alert(message.errorMsg); + let message = JSON.parse(request.responseText).resBody.result; + alert(message); } }); }