Resolve merge conflicts in UnableProduct.jsx

This commit is contained in:
Dev TWIN0906
2025-05-27 13:47:23 +09:00
parent 07003640bb
commit 75657c0d67
8 changed files with 48 additions and 31 deletions

View File

@@ -36,8 +36,16 @@ import {
clearCurationCoupon,
setEventIssueReq,
} from "../../actions/eventActions";
import { sendLogShopByMobile, sendLogTotalRecommend } from "../../actions/logActions";
import { ACTIVE_POPUP, LOG_CONTEXT_NAME, LOG_MESSAGE_ID, LOG_TP_NO } from "../../utils/Config";
import {
sendLogShopByMobile,
sendLogTotalRecommend,
} from "../../actions/logActions";
import {
ACTIVE_POPUP,
LOG_CONTEXT_NAME,
LOG_MESSAGE_ID,
LOG_TP_NO,
} from "../../utils/Config";
import {
$L,
decryptPhoneNumber,
@@ -383,9 +391,7 @@ export default function MobileSendPopUp({
if (smsTpCd === "APP00204") {
params = { ...params, curationId };
}
dispatch(sendSms(params));
}
// EVT00101 & APP00207(welcome) EVT00103 & APP00209 (welcome+Prizes) : smsTpCd 값을 받지 않음
@@ -436,12 +442,12 @@ export default function MobileSendPopUp({
curationCouponSuccess === 0
) {
const logParams = {
status: 'send',
status: "send",
nowMenu: nowMenu,
partner: patncNm,
contextName: LOG_CONTEXT_NAME.SHOPBYMOBILE,
messageId: LOG_MESSAGE_ID.SMB
}
messageId: LOG_MESSAGE_ID.SMB,
};
dispatch(sendLogTotalRecommend(logParams));
if (shopByMobileLogRef) {
let params = {
@@ -451,7 +457,7 @@ export default function MobileSendPopUp({
mbphNoFlag: "Y",
trmsAgrFlag: "Y",
};
dispatch(sendLogShopByMobile(params));
shopByMobileLogRef.current = null;
}