From dc03feaf9dfcd057763d3f2edabbb04e328c383d Mon Sep 17 00:00:00 2001 From: "hyunwoo93.cha" Date: Tue, 2 Jul 2024 14:55:23 +0900 Subject: [PATCH] checkout loading status fix / add my page tabs global variable --- .../assets/images/img-checkout-complete.png | Bin 0 -> 309 bytes .../images/img-checkout-complete@3x.png | Bin 3030 -> 0 bytes .../src/actions/checkoutActions.js | 3 +++ .../src/actions/pinCodeActions.js | 6 +++-- com.twin.app.shoptime/src/utils/Config.js | 10 ++++++++ .../src/views/ConfirmPanel/ConfirmPanel.jsx | 24 +++++++++++++++--- .../ConfirmPanel/ConfirmPanel.module.less | 13 +++++++++- 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 com.twin.app.shoptime/assets/images/img-checkout-complete.png delete mode 100644 com.twin.app.shoptime/assets/images/img-checkout-complete@3x.png diff --git a/com.twin.app.shoptime/assets/images/img-checkout-complete.png b/com.twin.app.shoptime/assets/images/img-checkout-complete.png new file mode 100644 index 0000000000000000000000000000000000000000..03f3df3077d9cf85370d321994ba100b2d9b847b GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0y~yV9WrrD_EF;q;6K}NgyQ};1lBNUf^@>+O@N1&)&Fk zaaNq#1^{k~p1xzJDe!&d!z3z>%K;BtT7srr_TW_yha~%p0aJc9a+pr)a z+r|7tnL=dajJOY*|EqE=(#ZHD;#^UcXMI#=+3ZCVR6HkLNqxE}Z|%;I{TZQKx680C zJYFiZYZj~Qu0EG=!{zUeF50g6qE4qus!7hl84Uj0R$aWay$u2QYM9hsZhXD(%bLe) zYu#TMrFO_Y?YQ@}!|%d{3;TQisbpkiypXxj{<(&k7Y^PQH-ZiDi)V+6AsBzfYMIQ1 WNvliajK!JX^Y{B(?XA@l z3je?72Vv$VykBdtQZ<(BWf2E z?UP|4B&u!^_8T?($*7^~e5Hc-~=PSoU=FSJ|gmf1NvYhC_y7 zPW$QPdHp}XUTXLE0?NHAs7- zcHi-;`%(-I3$DsOQ_r5k4idAG_wBh~ra;ZnaBw@C-D*BXhHUmT2gPXtdoM!;t zx-4vc)80&8h66lzV(#a12wO1RIC9l+`85WHGbdjD>T{j~RHL>}x;O!-q(^4WdkYs% z8HSug_5TG zv=%ZPkZt!A1m+)x2Af7^Aaw$0;ZWz?-VDrn50tF!?6$QOZvmyMxgS{Af!>;+UH~K+ zDuIzU${`R2+tXPY7!J5@0|p;s+5ur1V2C-~^PBge;_t7mXX72(+uJw)uswI~oXj)U zPv71~d;d6b@!~{P1_lGm;Qw8xrW$@fR%89_-HgYEzmwNl?n;wb;m%k1_|eYN*V9gX zoM@hZuLEeJ&$$rh<623OtZB#ywBmnSSL5S{GnOaw$?^laAL4y93u5Fxf1csq2Xqd@ z50PL_nbkW!CY`Bu2bHcht5)t&EBiWCq!5&LZ=4WeI^Jy9FAGw-VP!0P-__ee^DII2 zLW1;eKAF|w2k({e0C@+@$|Nn;^;wp(fH>QL9AJiezyahm5Y$%`~teE z;q!*m2MTW^n0KMf*V|VBbui?-_0|T_uP83!fu$hBjMYzzGC3Iv94ndzIy>&M)n=Hn z&$|4b&#UK=!19=tp~3UxXg(sb_yFaj%iljeJ?;6|#@*e0=!YWELp6Ts>FLveY5u^@ l&!Y)~!~`+2>!AM}1`LKfl9Npz-YEf { console.error("insertMyInfoCheckoutOrder onFail: ", error); + dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; TAxios( diff --git a/com.twin.app.shoptime/src/actions/pinCodeActions.js b/com.twin.app.shoptime/src/actions/pinCodeActions.js index eb221a50..6e49199f 100644 --- a/com.twin.app.shoptime/src/actions/pinCodeActions.js +++ b/com.twin.app.shoptime/src/actions/pinCodeActions.js @@ -20,11 +20,13 @@ export const getMyInfoCardPincodeCheck = payload: response.data, }); + if (response.data.retCode !== 0) { + dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); + } + if (callback) { callback(response.data); } - - dispatch(changeAppStatus({ showLoadingPanel: { show: false } })); }; const onFail = (error) => { diff --git a/com.twin.app.shoptime/src/utils/Config.js b/com.twin.app.shoptime/src/utils/Config.js index 589b2aa3..4dbee48a 100644 --- a/com.twin.app.shoptime/src/utils/Config.js +++ b/com.twin.app.shoptime/src/utils/Config.js @@ -90,6 +90,16 @@ export const PLAN = "PLAN"; export const ADD_PLAN = "ADD_PLAN"; export const MORE = "MORE"; +export const MYPAGE_TABS = { + MY_INFO: 30800, + MY_ORDERS: 30900, + RECENTLY_VIEWED: 30300, + FAVORITES: 30200, + REMINDERS: 30400, + SUPPORT: 30500, + TERMS_OF_SERVICE: 30600, +}; + export const MYINFO_TABS = { PAYMENT: 0, BILLING_ADDRESS: 1, diff --git a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx index 03841f08..1e40b1e0 100644 --- a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx +++ b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.jsx @@ -2,12 +2,15 @@ import React, { useCallback, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; +import confirmCardImage from "../../../assets/images/img-checkout-complete.png"; import { popPanel, pushPanel, resetPanels } from "../../actions/panelActions"; +import CustomImage from "../../components/CustomImage/CustomImage"; import TButton from "../../components/TButton/TButton"; import TPanel from "../../components/TPanel/TPanel"; import useLogService from "../../hooks/useLogService"; import * as Config from "../../utils/Config"; import { $L } from "../../utils/helperMethods"; +import { myPageComponents } from "../MyPagePanel/MyPagePanel"; import css from "./ConfirmPanel.module.less"; export default function ConfirmPanel({ spotlightId }) { @@ -15,6 +18,11 @@ export default function ConfirmPanel({ spotlightId }) { const dispatch = useDispatch(); const panels = useSelector((state) => state.panels.panels); + const myPageTabs = useSelector((state) => state.home.menuData.data.mypage); + const myOrder = + myPageTabs.find((item) => item.menuId === Config.MYPAGE_TABS.MY_ORDERS) || + {}; + const panelInfo = panels.find( (panel) => panel.name === "confirmpanel" )?.panelInfo; @@ -61,12 +69,13 @@ export default function ConfirmPanel({ spotlightId }) { pushPanel({ name: Config.panel_names.MY_PAGE_PANEL, panelInfo: { - menuNm: "My Orders", - menuOrd: 4, + menuId: myOrder.menuId, + menuNm: myOrder.menuNm, + menuOrd: myOrder.menuOrd, }, }) ); - }, [dispatch]); + }, [dispatch, myOrder]); const handleContinueClick = useCallback(() => { dispatch(resetPanels()); @@ -134,10 +143,17 @@ export default function ConfirmPanel({ spotlightId }) { )} + )}
- {$L("REVIEW ORDER")} + + {$L("REVIEW ORDER")} + {$L("CONTINUE SHOPPING")} diff --git a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.module.less b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.module.less index 744eaa5e..f75205cc 100644 --- a/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.module.less +++ b/com.twin.app.shoptime/src/views/ConfirmPanel/ConfirmPanel.module.less @@ -3,7 +3,7 @@ .confirmPanel { background-color: @BG_COLOR_01; - padding-top: 100px; + padding-top: 100px !important; .title { .font(@fontSize: 48px, @fontFamily: @baseFont); @@ -20,6 +20,13 @@ padding: 40px 0 90px 60px; border: 1px solid #dadada; border-radius: 12px; + position: relative; + + .img { + position: absolute; + bottom: 0; + right: 0; + } .topContents { margin-bottom: 27px; @@ -92,5 +99,9 @@ width: 100%; text-align: center; margin: 0 auto; + + .firstButton { + margin-right: 12px; + } } }