diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx
index ede5c703..f29e3e7a 100644
--- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx
+++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx
@@ -20,7 +20,10 @@ import {
setShowPopup,
} from '../../../actions/commonActions';
import { sendLogTotalRecommend } from '../../../actions/logActions';
-import { popPanel } from '../../../actions/panelActions';
+import {
+ popPanel,
+ pushPanel,
+} from '../../../actions/panelActions';
import TButton from '../../../components/TButton/TButton';
import TPopUp from '../../../components/TPopUp/TPopUp';
import TQRCode from '../../../components/TQRCode/TQRCode';
@@ -249,13 +252,25 @@ export default function InformationContainer({
);
const handleCancel = useCallback(() => {
- dispatch(setHidePopup());
- }, [dispatch]);
-
- const handleDone = useCallback(() => {
- dispatch(setHidePopup());
+ // dispatch(setHidePopup());
+ const { patnrId, prdtId } = checkoutData.productList[0];
dispatch(popPanel());
- }, [dispatch]);
+ dispatch(
+ pushPanel({
+ name: Config.panel_names.DETAIL_PANEL,
+ panelInfo: { patnrId, prdtId },
+ })
+ );
+ }, [dispatch, checkoutData]);
+
+ const { shippingAddressList, billingAddressList, cardInfo } = checkoutData || {};
+
+ useEffect(() => {
+ if (!shippingAddressList || !billingAddressList || !cardInfo) {
+ // if (shippingAddressList || billingAddressList || cardInfo) { //확인용도로 반대로 테스트중.
+ dispatch(setShowPopup(Config.ACTIVE_POPUP.qrPopup));
+ }
+ }, [shippingAddressList, billingAddressList, cardInfo, dispatch])
return (
<>
@@ -282,8 +297,8 @@ export default function InformationContainer({
>
ADD/EDIT
- {checkoutData?.shippingAddressList && (
-
+ {shippingAddressList && (
+
)}
@@ -300,8 +315,8 @@ export default function InformationContainer({
{/*
Mock Billing Address
*/}
- {checkoutData?.billingAddressList && (
-
+ {billingAddressList && (
+
)}
@@ -314,7 +329,7 @@ export default function InformationContainer({
>
ADD/EDIT
- {checkoutData?.cardInfo &&
}
+ {cardInfo &&
}
@@ -355,7 +370,7 @@ export default function InformationContainer({
'Please update your information and complete the payment on your mobile. By clicking the OK button, you will be redirected to the product details page'
)}
-
+
{$L('OK')}
diff --git a/com.twin.app.shoptime/src/views/DetailPanel/ProductOverview/ProductPriceDisplay/ShopByMobilePriceDisplay/ShopByMobilePriceDisplay.jsx b/com.twin.app.shoptime/src/views/DetailPanel/ProductOverview/ProductPriceDisplay/ShopByMobilePriceDisplay/ShopByMobilePriceDisplay.jsx
index a46fb901..05f56851 100644
--- a/com.twin.app.shoptime/src/views/DetailPanel/ProductOverview/ProductPriceDisplay/ShopByMobilePriceDisplay/ShopByMobilePriceDisplay.jsx
+++ b/com.twin.app.shoptime/src/views/DetailPanel/ProductOverview/ProductPriceDisplay/ShopByMobilePriceDisplay/ShopByMobilePriceDisplay.jsx
@@ -9,6 +9,12 @@ import usePriceInfo from '../../../../../hooks/usePriceInfo';
import { $L } from '../../../../../utils/helperMethods';
import css from './ShopByMobilePriceDisplay.module.less';
+// 파트너명에서 "Peacock | Shop The Moment" 형식일 때 "Peacock"만 추출
+const extractPartnerName = (name) => {
+ if (!name) return name;
+ return name.includes(' | ') ? name.split(' | ')[0].trim() : name;
+};
+
export default function ShopByMobilePriceDisplay({
priceData,
priceInfo,
@@ -26,6 +32,10 @@ export default function ShopByMobilePriceDisplay({
orderPhnNo,
} = priceData;
+ // 파트너명 정규화
+ const cleanPatncNm = useMemo(() => extractPartnerName(patncNm), [patncNm]);
+ const cleanPatnrName = useMemo(() => extractPartnerName(patnrName), [patnrName]);
+
const {
discountRate,
rewardFlag,
@@ -50,6 +60,8 @@ export default function ShopByMobilePriceDisplay({
[isOriginalPriceEmpty, isDiscountedPriceEmpty, price5, offerInfo]
);
+
+
const renderPriceItem = useCallback(() => {
if (priceData && !promotionCode) {
if (rewd) {
@@ -57,9 +69,9 @@ export default function ShopByMobilePriceDisplay({
- {patncNm
- ? patncNm + " " + $L("Price") + " "
- : patnrName + " " + $L("Price") + " "}
+ {cleanPatncNm
+ ? cleanPatncNm + " " + $L("Price") + " "
+ : cleanPatnrName + " " + $L("Price") + " "}
{TYPE_CASE.case5 || TYPE_CASE.case8
@@ -95,9 +107,9 @@ export default function ShopByMobilePriceDisplay({
return (
- {patncNm
- ? patncNm + " " + $L("Price")
- : patnrName + " " + $L("Price")}
+ {cleanPatncNm
+ ? cleanPatncNm + " " + $L("Price")
+ : cleanPatnrName + " " + $L("Price")}
@@ -111,9 +123,9 @@ export default function ShopByMobilePriceDisplay({
- {patncNm
- ? patncNm + " " + $L("Price")
- : patnrName + $L("Price")}
+ {cleanPatncNm
+ ? cleanPatncNm + " " + $L("Price")
+ : cleanPatnrName + $L("Price")}
{discountRate && Number(discountRate.replace("%", "")) > 4 && (
@@ -140,9 +152,9 @@ export default function ShopByMobilePriceDisplay({
- {patncNm
- ? patncNm + " " + $L("Price")
- : patnrName + " " + $L("Price")}
+ {cleanPatncNm
+ ? cleanPatncNm + " " + $L("Price")
+ : cleanPatnrName + " " + $L("Price")}
{discountRate && Number(discountRate.replace("%", "")) > 4 && (
@@ -194,7 +206,7 @@ export default function ShopByMobilePriceDisplay({
return (
- {patncNm ? patncNm + " " + $L("Price") : patnrName + $L("Price")}
+ {cleanPatncNm ? cleanPatncNm + " " + $L("Price") : cleanPatnrName + $L("Price")}
{renderPriceItem()}
;
-}
+}
\ No newline at end of file
diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.jsx b/com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.jsx
index 32b7380d..efa6abf8 100644
--- a/com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.jsx
+++ b/com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.jsx
@@ -77,7 +77,7 @@ export default function THeaderCustom({
if(onBackButtonFocus){
onBackButtonFocus();
}
- },[onBackButtonFocus])
+ },[onBackButtonFocus])
return (
@@ -113,7 +113,7 @@ export default function THeaderCustom({
marqueeDisabled={marqueeDisabled}
aria-label={ariaLabel}
>
- {prdtId && ID : {prdtId}}
+ {(prdtId && patnrId !== "21") && ID : {prdtId}}
{convertedTitle && (
)}