test
This commit is contained in:
@@ -38,7 +38,7 @@ import { checkGrant } from '@/shared/lib/check-grant';
|
||||
import { snackBar } from '@/shared/lib';
|
||||
import { useSettlementsHistoryExcelMutation } from '../api/use-settlements-history-excel-mutation';
|
||||
import { VatReturnDownloadExcelResponse } from '@/entities/vat-return/model/types';
|
||||
import { useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
|
||||
export interface ListWrapProps {
|
||||
startDateFromCalendar?: string;
|
||||
@@ -67,7 +67,7 @@ export const ListWrap = ({
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [settlementDateListItems, setSettlementDateListItems] = useState<Array<SettlementsHistoryContent>>([]);
|
||||
const [transactionDatelistItems, setTransactionDateListItems] = useState<Array<SettlementsTransactionListContent>>([]);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
const [periodType, setPeriodType] = useState<SettlementPeriodType>(defaultParams.periodType);
|
||||
@@ -88,7 +88,7 @@ export const ListWrap = ({
|
||||
const [preSettlementCancelOffset, setPreSettlementCancelOffset] = useState<number>();
|
||||
const [isOpenSummary, setIsOpenSummary] = useState<boolean>(false);
|
||||
|
||||
const [detailOn, setDetailOn] = useState<boolean>(false);
|
||||
const { detailOn, setDetailOn } = useDetailOnStore();
|
||||
const [detailSettlementId, setDetailSettlementId] = useState<string>('');
|
||||
const [detailTid, setDetailTid] = useState<string>('');
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
|
||||
import { useAllTransactioCancleMutation } from '../api/use-all-transaction-cancel-mutation';
|
||||
import { useAllTransactioCancleInfoMutation } from '../api/use-all-transaction-cancel-info-mutation';
|
||||
import { snackBar } from '@/shared/lib';
|
||||
import { useStore } from '@/shared/model/store';
|
||||
import { useStore, useTransactionCancelPreventBondOnStore } from '@/shared/model/store';
|
||||
|
||||
export interface AllTransactionCancelProps {
|
||||
cancelOn: boolean;
|
||||
@@ -55,7 +55,7 @@ export const AllTransactionCancel = ({
|
||||
const [accountNo, setAccountNo] = useState<string>('');
|
||||
const [accountHolder, setAccountHolder] = useState<string>('');
|
||||
|
||||
const [cancelPreventBondOn, setCancelPreventBondOn] = useState<boolean>(false);
|
||||
const {cancelPreventBondOn, setCancelPreventBondOn} = useTransactionCancelPreventBondOnStore();
|
||||
|
||||
const { mutateAsync: transactionCancel } = useAllTransactioCancleMutation();
|
||||
const { mutateAsync: allTransactionCancelInfo } = useAllTransactioCancleInfoMutation();
|
||||
|
||||
@@ -34,6 +34,7 @@ import { checkGrant } from '@/shared/lib/check-grant';
|
||||
import { showAlert } from '@/widgets/show-alert';
|
||||
import { snackBar } from '@/shared/lib';
|
||||
import { AllTransactionCancel } from '../all-transaction-cancel';
|
||||
import { useTransactionCancelOnStore } from '@/shared/model/store';
|
||||
|
||||
export interface AllTransactionDetailProps {
|
||||
detailOn: boolean;
|
||||
@@ -65,7 +66,7 @@ export const AllTransactionDetail = ({
|
||||
const [showSettlementInfo, setShowSettlementInfo] = useState<boolean>(false);
|
||||
const [showPartCancelInfo, setShowPartCancelInfo] = useState<boolean>(false);
|
||||
|
||||
const [cancelOn, setCancelOn] = useState<boolean>(false);
|
||||
const { transactionCancelOn, setTransactionCancelOn } = useTransactionCancelOnStore();
|
||||
const { mutateAsync: allTransactionDetail } = useAllTransactionDetailMutation();
|
||||
|
||||
const callDetail = () => {
|
||||
@@ -88,7 +89,7 @@ export const AllTransactionDetail = ({
|
||||
});
|
||||
};
|
||||
const onClickToMoveCancel = () => {
|
||||
setCancelOn(true);
|
||||
setTransactionCancelOn(true);
|
||||
};
|
||||
useEffect(() => {
|
||||
if(!!detailOn && serviceCode && tid){
|
||||
@@ -240,10 +241,10 @@ export const AllTransactionDetail = ({
|
||||
>{t('transaction.cancelTransaction')}</button>
|
||||
</div>
|
||||
</motion.div>
|
||||
{ !!cancelOn &&
|
||||
{ !!transactionCancelOn &&
|
||||
<AllTransactionCancel
|
||||
cancelOn={ cancelOn }
|
||||
setCancelOn={ setCancelOn }
|
||||
cancelOn={ transactionCancelOn }
|
||||
setCancelOn={ setTransactionCancelOn }
|
||||
serviceCode={ serviceCode }
|
||||
tid={ tid }
|
||||
></AllTransactionCancel>
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
} from '../model/types';
|
||||
import { useVatReturnListMutation } from '../api/use-vat-return-list-mutation';
|
||||
import { ListDateGroup } from './list-date-group';
|
||||
import { useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
import { DownloadBottomSheet, DownloadSelectedMode } from '@/entities/common/ui/download-bottom-sheet';
|
||||
import useIntersectionObserver from '@/widgets/intersection-observer';
|
||||
import { TaxInvoiceDetail } from './detail/tax-invoice-detail';
|
||||
@@ -40,7 +40,7 @@ export const ListWrap = () => {
|
||||
const userMid = useStore.getState().UserStore.mid;
|
||||
|
||||
const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [listItems, setListItems] = useState<Array<VatReturnListContent>>([]);
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
@@ -52,7 +52,7 @@ export const ListWrap = () => {
|
||||
|
||||
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
|
||||
|
||||
const [detailOn, setDetailOn] = useState<boolean>(false);
|
||||
const { detailOn, setDetailOn } = useDetailOnStore();
|
||||
const [detailTaxInvoiceNumber, setDetailTaxInvoiceNumber] = useState<string>('');
|
||||
|
||||
const [groupDate, setGroupDate] = useState<string>('');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import moment from 'moment';
|
||||
import { useDetailOnStore, useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
import { ChangeEvent, useEffect, useState } from 'react';
|
||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
||||
import { PATHS } from '@/shared/constants/paths';
|
||||
@@ -66,7 +66,7 @@ export const AllTransactionListPage = () => {
|
||||
const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [listItems, setListItems] = useState<Array<ListItemProps>>([]);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
const [moid, setMoid] = useState<string>(defaultParams.moid);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import moment from 'moment';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useDetailOnStore, useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
||||
import { PATHS } from '@/shared/constants/paths';
|
||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||
@@ -59,7 +59,7 @@ export const BillingListPage = () => {
|
||||
const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [listItems, setListItems] = useState<Array<ListItemProps>>([]);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
const [searchType, setSearchType] = useState<BillingSearchType>(defaultParams.searchType);
|
||||
|
||||
@@ -33,7 +33,7 @@ import {
|
||||
useSetFooterMode
|
||||
} from '@/widgets/sub-layout/use-sub-layout';
|
||||
import { getCashReceiptTransactionTypeBtnGroup } from '@/entities/transaction/model/contant';
|
||||
import { useDetailOnStore, useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
import { useCashReceiptSummaryMutation } from '@/entities/transaction/api/use-cash-receipt-summary-mutation';
|
||||
import { DownloadBottomSheet, DownloadSelectedMode } from '@/entities/common/ui/download-bottom-sheet';
|
||||
import useIntersectionObserver from '@/widgets/intersection-observer';
|
||||
@@ -62,7 +62,7 @@ export const CashReceiptListPage = () => {
|
||||
const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [listItems, setListItems] = useState<Array<ListItemProps>>([]);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
const [startDate, setStartDate] = useState<string>(moment().format('YYYYMMDD'));
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import moment from 'moment';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useDetailOnStore, useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFilterlOnStore, useStore } from '@/shared/model/store';
|
||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
||||
import { PATHS } from '@/shared/constants/paths';
|
||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||
@@ -59,7 +59,7 @@ export const EscrowListPage = () => {
|
||||
const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
|
||||
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
|
||||
const [listItems, setListItems] = useState<Array<ListItemProps>>([]);
|
||||
const [filterOn, setFilterOn] = useState<boolean>(false);
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
const [searchType, setSearchType] = useState<EscrowSearchType>(EscrowSearchType.ALL);
|
||||
|
||||
@@ -6,9 +6,18 @@ import { createUserInfoStore, UserInfoState } from '@/entities/user/model/store'
|
||||
import { createBannerInfoStore, BannerInfoState, createCommonStore, CommonState } from '@/entities/common/model/store';
|
||||
import { StorageKeys } from '@/shared/constants/local-storage';
|
||||
|
||||
export interface ModalOnStore {
|
||||
modalOn: boolean;
|
||||
setModalOn: (modalOn: boolean) => void;
|
||||
export interface FilterOnStore {
|
||||
filterOn: boolean;
|
||||
setFilterOn: (filterOn: boolean) => void;
|
||||
};
|
||||
|
||||
export interface TransactionCancelPreventBondOnStore {
|
||||
cancelPreventBondOn: boolean;
|
||||
setCancelPreventBondOn: (cancelPreventBondOn: boolean) => void;
|
||||
};
|
||||
export interface TransactionCancelOnStore {
|
||||
transactionCancelOn: boolean;
|
||||
setTransactionCancelOn: (modalOn: boolean) => void;
|
||||
};
|
||||
export interface DetailOnStore {
|
||||
detailOn: boolean;
|
||||
@@ -29,11 +38,27 @@ export interface MenuIdsStore {
|
||||
deleteMenuId: (menuId: number) => void;
|
||||
};
|
||||
|
||||
export const useModalOnStore = create<ModalOnStore>((set) => ({
|
||||
modalOn: false,
|
||||
setModalOn: (modalOn: boolean) => {
|
||||
set((state: {modalOn: boolean}) => ({
|
||||
modalOn: (state.modalOn = modalOn)
|
||||
export const useFilterlOnStore = create<FilterOnStore>((set) => ({
|
||||
filterOn: false,
|
||||
setFilterOn: (filterOn: boolean) => {
|
||||
set((state: {filterOn: boolean}) => ({
|
||||
filterOn: (state.filterOn = filterOn)
|
||||
}));
|
||||
}
|
||||
}));
|
||||
export const useTransactionCancelPreventBondOnStore = create<TransactionCancelPreventBondOnStore>((set) => ({
|
||||
cancelPreventBondOn: false,
|
||||
setCancelPreventBondOn: (cancelPreventBondOn: boolean) => {
|
||||
set((state: {cancelPreventBondOn: boolean}) => ({
|
||||
cancelPreventBondOn: (state.cancelPreventBondOn = cancelPreventBondOn)
|
||||
}));
|
||||
}
|
||||
}));
|
||||
export const useTransactionCancelOnStore = create<TransactionCancelOnStore>((set) => ({
|
||||
transactionCancelOn: false,
|
||||
setTransactionCancelOn: (transactionCancelOn: boolean) => {
|
||||
set((state: {transactionCancelOn: boolean}) => ({
|
||||
transactionCancelOn: (state.transactionCancelOn = transactionCancelOn)
|
||||
}));
|
||||
}
|
||||
}));
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
import { useHomeGroupsMutation } from '@/entities/home/api/use-home-groups-mutation';
|
||||
import { useUserInfo } from '@/entities/user/lib/use-user-info';
|
||||
import { useAppBridge } from '@/hooks';
|
||||
import { useDetailOnStore, useFavoriteEditOnStore, useMenuOnStore, useStore } from '@/shared/model/store';
|
||||
import { useDetailOnStore, useFavoriteEditOnStore, useFilterlOnStore, useMenuOnStore, useStore, useTransactionCancelOnStore, useTransactionCancelPreventBondOnStore } from '@/shared/model/store';
|
||||
import { HomeGroupsParams, HomeGroupsResponse } from '@/entities/home/model/types';
|
||||
import {
|
||||
BusinessPropertyParams,
|
||||
@@ -68,9 +68,13 @@ export const SubLayout = () => {
|
||||
} = useUserInfo();
|
||||
|
||||
const { reload, navigateBack } = useNavigate();
|
||||
|
||||
const { menuOn, setMenuOn } = useMenuOnStore();
|
||||
const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore();
|
||||
const { detailOn, setDetailOn } = useDetailOnStore();
|
||||
const { transactionCancelOn, setTransactionCancelOn } = useTransactionCancelOnStore();
|
||||
const { cancelPreventBondOn, setCancelPreventBondOn } = useTransactionCancelPreventBondOnStore();
|
||||
const { filterOn, setFilterOn } = useFilterlOnStore();
|
||||
|
||||
const location = useLocation();
|
||||
console.log(location)
|
||||
@@ -405,16 +409,31 @@ export const SubLayout = () => {
|
||||
const pressBackKey = () => {
|
||||
let pathname = location.pathname;
|
||||
console.log('pathname = [' + pathname + ']');
|
||||
if(menuOn){
|
||||
setMenuOn(false);
|
||||
setFavoriteEditOn(false);
|
||||
}
|
||||
else if(detailOn){
|
||||
setDetailOn(false);
|
||||
if(pathname === '/home'){
|
||||
|
||||
}
|
||||
else{
|
||||
navigateBack();
|
||||
if(menuOn){
|
||||
setMenuOn(false);
|
||||
setFavoriteEditOn(false);
|
||||
}
|
||||
else if(cancelPreventBondOn){
|
||||
setCancelPreventBondOn(false);
|
||||
}
|
||||
else if(transactionCancelOn){
|
||||
setTransactionCancelOn(false);
|
||||
}
|
||||
else if(detailOn){
|
||||
setDetailOn(false);
|
||||
}
|
||||
else if(filterOn){
|
||||
setFilterOn(false);
|
||||
}
|
||||
else{
|
||||
navigateBack();
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
window.saveToken = saveToken;
|
||||
|
||||
Reference in New Issue
Block a user