diff --git a/com.twin.app.shoptime/src/actions/commonActions.js b/com.twin.app.shoptime/src/actions/commonActions.js index f49b27d8..ffe9eaa9 100644 --- a/com.twin.app.shoptime/src/actions/commonActions.js +++ b/com.twin.app.shoptime/src/actions/commonActions.js @@ -391,11 +391,11 @@ export const deleteReservationCallback = (scheduleIdList) => (dispatch) => { lunaSend.deleteReservationCallback(scheduleIdList, { onSuccess: (res) => { // pyh todo, deleted alertToast - dispatch(alertToast("success" + JSON.stringify(res))); + // dispatch(alertToast("success" + JSON.stringify(res))); }, onFailure: (err) => { // pyh todo, deleted alertToast - dispatch(alertToast("failed" + JSON.stringify(err))); + // dispatch(alertToast("failed" + JSON.stringify(err))); }, }); }; diff --git a/com.twin.app.shoptime/src/actions/mainActions.js b/com.twin.app.shoptime/src/actions/mainActions.js index bc0a547b..7333540b 100644 --- a/com.twin.app.shoptime/src/actions/mainActions.js +++ b/com.twin.app.shoptime/src/actions/mainActions.js @@ -1,5 +1,6 @@ import { URLS } from "../api/apiConfig"; import { TAxios } from "../api/TAxios"; +import { convertUtcToLocal } from "../components/MediaPlayer/util"; import { CATEGORY_DATA_MAX_RESULTS_LIMIT } from "../utils/Config"; import * as HelperMethods from "../utils/helperMethods"; import { types } from "./actionTypes"; @@ -49,26 +50,28 @@ export const setMainLiveUpcomingAlarm = (props) => (dispatch, getState) => { testStrtDt, } = props; + const convertedStrtDt = convertUtcToLocal(strtDt); + const onSuccess = (response) => { console.log("setMainLiveUpcomingAlarm onSuccess", response.data); if (alamDispFlag === "Y") { const data = { startTime: { - // year: new Date(strtDt).getFullYear(), - // month: new Date(strtDt).getMonth() + 1, - // day: new Date(strtDt).getDate(), - // hour: new Date(strtDt).getHours(), - // minute: new Date(strtDt).getMinutes(), - // second: new Date(strtDt).getSeconds(), + year: new Date(convertedStrtDt).getFullYear(), + month: new Date(convertedStrtDt).getMonth() + 1, + day: new Date(convertedStrtDt).getDate(), + hour: new Date(convertedStrtDt).getHours(), + minute: new Date(convertedStrtDt).getMinutes(), + second: new Date(convertedStrtDt).getSeconds(), // pyh, delete test case - year: new Date(testStrtDt).getFullYear(), - month: new Date(testStrtDt).getMonth() + 1, - day: new Date(testStrtDt).getDate(), - hour: new Date(testStrtDt).getHours(), - minute: new Date(testStrtDt).getMinutes(), - second: new Date(testStrtDt).getSeconds(), + // year: new Date(testStrtDt).getFullYear(), + // month: new Date(testStrtDt).getMonth() + 1, + // day: new Date(testStrtDt).getDate(), + // hour: new Date(testStrtDt).getHours(), + // minute: new Date(testStrtDt).getMinutes(), + // second: new Date(testStrtDt).getSeconds(), }, params: { message: `[${patncNm}] ${showNm}\nWatch Live show now?`, diff --git a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx index 285bf996..407c60d9 100644 --- a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx +++ b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx @@ -1,27 +1,18 @@ -import React, { - memo, - useCallback, - useEffect, - useState, -} from 'react'; +import React, { memo, useCallback, useEffect, useState } from "react"; -import classNames from 'classnames'; +import classNames from "classnames"; -import Spottable from '@enact/spotlight/Spottable'; +import Spottable from "@enact/spotlight/Spottable"; -import defaultLogoImg - from '../../../assets/images/ic-tab-partners-default@3x.png'; -import defaultimgHorizontal - from '../../../assets/images/img-thumb-empty-hor@3x.png'; -import defaultImageItem - from '../../../assets/images/img-thumb-empty-product@3x.png'; -import defaultimgVertical - from '../../../assets/images/img-thumb-empty-ver@3x.png'; -import IcLiveShow from '../../../assets/images/tag/tag-liveshow.png'; -import usePriceInfo from '../../hooks/usePriceInfo'; -import { $L } from '../../utils/helperMethods'; -import CustomImage from '../CustomImage/CustomImage'; -import css from './TItemCard.module.less'; +import defaultLogoImg from "../../../assets/images/ic-tab-partners-default@3x.png"; +import defaultimgHorizontal from "../../../assets/images/img-thumb-empty-hor@3x.png"; +import defaultImageItem from "../../../assets/images/img-thumb-empty-product@3x.png"; +import defaultimgVertical from "../../../assets/images/img-thumb-empty-ver@3x.png"; +import IcLiveShow from "../../../assets/images/tag/tag-liveshow.png"; +import usePriceInfo from "../../hooks/usePriceInfo"; +import { $L } from "../../utils/helperMethods"; +import CustomImage from "../CustomImage/CustomImage"; +import css from "./TItemCard.module.less"; const SpottableComponent = Spottable("div"); @@ -36,7 +27,6 @@ const IMAGETYPES = { imgVertical: "imgVertical", }; -// @@pyh Todo, 추후 다국어 resource 추가 const STRING_CONF = { SOLD_OUT: $L("SOLD OUT"), }; diff --git a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx index abf59895..c84cece6 100644 --- a/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx +++ b/com.twin.app.shoptime/src/views/PlayerPanel/PlayerItemCard/PlayerItemCard.jsx @@ -22,7 +22,6 @@ const IMAGETYPES = { imgVertical: "imgVertical", }; -// @@pyh Todo, 추후 다국어 resource 추가 const STRING_CONF = { SOLD_OUT: $L("SOLD OUT"), TOP: $L("TOP"),