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 00000000..03f3df30
Binary files /dev/null and b/com.twin.app.shoptime/assets/images/img-checkout-complete.png differ
diff --git a/com.twin.app.shoptime/assets/images/img-checkout-complete@3x.png b/com.twin.app.shoptime/assets/images/img-checkout-complete@3x.png
deleted file mode 100644
index 4fdfa396..00000000
Binary files a/com.twin.app.shoptime/assets/images/img-checkout-complete@3x.png and /dev/null differ
diff --git a/com.twin.app.shoptime/src/actions/checkoutActions.js b/com.twin.app.shoptime/src/actions/checkoutActions.js
index c38f30de..70c54f15 100644
--- a/com.twin.app.shoptime/src/actions/checkoutActions.js
+++ b/com.twin.app.shoptime/src/actions/checkoutActions.js
@@ -56,11 +56,14 @@ export const insertMyInfoCheckoutOrder =
payload: response.data.data,
});
+ dispatch(changeAppStatus({ showLoadingPanel: { show: false } }));
+
if (callback) callback(response);
};
const onFail = (error) => {
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 }) {
)}
+