From cc3e72bf94acdc190fad30749225ac27d9967404 Mon Sep 17 00:00:00 2001 From: AlexSserb Date: Wed, 12 Feb 2025 15:28:17 +0400 Subject: [PATCH] feat: removed price categories --- src/client/index.ts | 9 -- .../models/CreatePriceCategoryRequest.ts | 8 -- .../models/CreatePriceCategoryResponse.ts | 9 -- src/client/models/DealQuickCreateRequest.ts | 2 - src/client/models/DealSchema.ts | 2 - .../models/DeletePriceCategoryRequest.ts | 8 -- .../models/DeletePriceCategoryResponse.ts | 9 -- .../models/GetAllPriceCategoriesResponse.ts | 9 -- ...orySchema.ts => ProjectSchemaWithCount.ts} | 5 +- .../models/ServiceCategoryPriceSchema.ts | 10 --- src/client/models/ServiceSchema.ts | 2 - .../models/UpdatePriceCategoryRequest.ts | 9 -- .../models/UpdatePriceCategoryResponse.ts | 9 -- src/client/services/ServiceService.ts | 78 ----------------- .../Deals/CreateDealForm/CreateDealFrom.tsx | 9 -- .../ServicePriceCategorySelect.tsx | 19 ----- .../ServiceWithPriceInput.tsx | 18 +--- src/modals/modals.ts | 2 - .../tabs/DealEditDrawerGeneralTab.tsx | 8 -- .../DealsPage/modals/AddDealServiceModal.tsx | 16 +--- .../modals/ProductServiceFormModal.tsx | 3 - .../DealServicesTable/DealServicesTable.tsx | 1 - .../ProductServicesTable.tsx | 2 - .../ServicePriceCategoryTable.tsx | 53 ------------ .../ServicePriceCategoryTable/columns.tsx | 19 ----- .../ServicePriceInput/PriceCategoryInput.tsx | 70 ---------------- .../ServicePriceTypeSegmentedControl.tsx | 5 -- .../ServiceTypeSegmentedControl.tsx | 5 -- .../hooks/useServicePriceCategoriesList.tsx | 11 --- .../hooks/useServicePriceCategoryState.tsx | 83 ------------------- .../modals/CreateServiceModal.tsx | 20 +---- .../modals/ServicePriceCategoryForm.tsx | 44 ---------- src/pages/ServicesPage/ui/ServicesPage.tsx | 25 ------ src/types/QuickDeal.ts | 3 +- 34 files changed, 10 insertions(+), 575 deletions(-) delete mode 100644 src/client/models/CreatePriceCategoryRequest.ts delete mode 100644 src/client/models/CreatePriceCategoryResponse.ts delete mode 100644 src/client/models/DeletePriceCategoryRequest.ts delete mode 100644 src/client/models/DeletePriceCategoryResponse.ts delete mode 100644 src/client/models/GetAllPriceCategoriesResponse.ts rename src/client/models/{ServicePriceCategorySchema.ts => ProjectSchemaWithCount.ts} (72%) delete mode 100644 src/client/models/ServiceCategoryPriceSchema.ts delete mode 100644 src/client/models/UpdatePriceCategoryRequest.ts delete mode 100644 src/client/models/UpdatePriceCategoryResponse.ts delete mode 100644 src/components/Selects/ServicePriceCategorySelect/ServicePriceCategorySelect.tsx delete mode 100644 src/pages/ServicesPage/components/ServicePriceCategoryTable/ServicePriceCategoryTable.tsx delete mode 100644 src/pages/ServicesPage/components/ServicePriceCategoryTable/columns.tsx delete mode 100644 src/pages/ServicesPage/components/ServicePriceInput/PriceCategoryInput.tsx delete mode 100644 src/pages/ServicesPage/hooks/useServicePriceCategoriesList.tsx delete mode 100644 src/pages/ServicesPage/hooks/useServicePriceCategoryState.tsx delete mode 100644 src/pages/ServicesPage/modals/ServicePriceCategoryForm.tsx diff --git a/src/client/index.ts b/src/client/index.ts index 7f087ff..1d8514a 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -77,8 +77,6 @@ export type { CreatePayRateRequest } from './models/CreatePayRateRequest'; export type { CreatePayRateResponse } from './models/CreatePayRateResponse'; export type { CreatePositionRequest } from './models/CreatePositionRequest'; export type { CreatePositionResponse } from './models/CreatePositionResponse'; -export type { CreatePriceCategoryRequest } from './models/CreatePriceCategoryRequest'; -export type { CreatePriceCategoryResponse } from './models/CreatePriceCategoryResponse'; export type { CreateProjectRequest } from './models/CreateProjectRequest'; export type { CreateProjectResponse } from './models/CreateProjectResponse'; export type { CreateResidualBoxRequest } from './models/CreateResidualBoxRequest'; @@ -180,8 +178,6 @@ export type { DeletePayRateRequest } from './models/DeletePayRateRequest'; export type { DeletePayRateResponse } from './models/DeletePayRateResponse'; export type { DeletePositionRequest } from './models/DeletePositionRequest'; export type { DeletePositionResponse } from './models/DeletePositionResponse'; -export type { DeletePriceCategoryRequest } from './models/DeletePriceCategoryRequest'; -export type { DeletePriceCategoryResponse } from './models/DeletePriceCategoryResponse'; export type { DeleteProjectResponse } from './models/DeleteProjectResponse'; export type { DeleteResidualBoxResponse } from './models/DeleteResidualBoxResponse'; export type { DeleteResidualPalletResponse } from './models/DeleteResidualPalletResponse'; @@ -211,7 +207,6 @@ export type { GetAllBaseMarketplacesResponse } from './models/GetAllBaseMarketpl export type { GetAllPayRatesResponse } from './models/GetAllPayRatesResponse'; export type { GetAllPayrollSchemeResponse } from './models/GetAllPayrollSchemeResponse'; export type { GetAllPositionsResponse } from './models/GetAllPositionsResponse'; -export type { GetAllPriceCategoriesResponse } from './models/GetAllPriceCategoriesResponse'; export type { GetAllRolesResponse } from './models/GetAllRolesResponse'; export type { GetAllServicesKitsResponse } from './models/GetAllServicesKitsResponse'; export type { GetAllShippingWarehousesResponse } from './models/GetAllShippingWarehousesResponse'; @@ -307,7 +302,6 @@ export type { ResidualBoxSchema } from './models/ResidualBoxSchema'; export type { ResidualPalletSchema } from './models/ResidualPalletSchema'; export type { ResidualProductSchema } from './models/ResidualProductSchema'; export type { RoleSchema } from './models/RoleSchema'; -export type { ServiceCategoryPriceSchema } from './models/ServiceCategoryPriceSchema'; export type { ServiceCategoryReorderRequest } from './models/ServiceCategoryReorderRequest'; export type { ServiceCategoryReorderResponse } from './models/ServiceCategoryReorderResponse'; export type { ServiceCategorySchema } from './models/ServiceCategorySchema'; @@ -321,7 +315,6 @@ export type { ServiceDeleteRequest } from './models/ServiceDeleteRequest'; export type { ServiceDeleteResponse } from './models/ServiceDeleteResponse'; export type { ServiceGetAllCategoriesResponse } from './models/ServiceGetAllCategoriesResponse'; export type { ServiceGetAllResponse } from './models/ServiceGetAllResponse'; -export type { ServicePriceCategorySchema } from './models/ServicePriceCategorySchema'; export type { ServicePriceRangeSchema } from './models/ServicePriceRangeSchema'; export type { ServiceReorderRequest } from './models/ServiceReorderRequest'; export type { ServiceReorderResponse } from './models/ServiceReorderResponse'; @@ -359,8 +352,6 @@ export type { UpdatePayRateRequest } from './models/UpdatePayRateRequest'; export type { UpdatePayRateResponse } from './models/UpdatePayRateResponse'; export type { UpdatePlanningWorkShiftRequest } from './models/UpdatePlanningWorkShiftRequest'; export type { UpdatePlanningWorkShiftResponse } from './models/UpdatePlanningWorkShiftResponse'; -export type { UpdatePriceCategoryRequest } from './models/UpdatePriceCategoryRequest'; -export type { UpdatePriceCategoryResponse } from './models/UpdatePriceCategoryResponse'; export type { UpdateProjectRequest } from './models/UpdateProjectRequest'; export type { UpdateProjectResponse } from './models/UpdateProjectResponse'; export type { UpdateResidualProductRequest } from './models/UpdateResidualProductRequest'; diff --git a/src/client/models/CreatePriceCategoryRequest.ts b/src/client/models/CreatePriceCategoryRequest.ts deleted file mode 100644 index 190f822..0000000 --- a/src/client/models/CreatePriceCategoryRequest.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type CreatePriceCategoryRequest = { - name: string; -}; - diff --git a/src/client/models/CreatePriceCategoryResponse.ts b/src/client/models/CreatePriceCategoryResponse.ts deleted file mode 100644 index b4e605d..0000000 --- a/src/client/models/CreatePriceCategoryResponse.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type CreatePriceCategoryResponse = { - ok: boolean; - message: string; -}; - diff --git a/src/client/models/DealQuickCreateRequest.ts b/src/client/models/DealQuickCreateRequest.ts index ffe1bda..333e413 100644 --- a/src/client/models/DealQuickCreateRequest.ts +++ b/src/client/models/DealQuickCreateRequest.ts @@ -3,7 +3,6 @@ /* tslint:disable */ /* eslint-disable */ import type { BaseMarketplaceSchema } from './BaseMarketplaceSchema'; -import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema'; export type DealQuickCreateRequest = { name: string; clientName: string; @@ -11,7 +10,6 @@ export type DealQuickCreateRequest = { acceptanceDate: string; shippingWarehouse: string; baseMarketplace: BaseMarketplaceSchema; - category?: (ServicePriceCategorySchema | null); statusId: number; }; diff --git a/src/client/models/DealSchema.ts b/src/client/models/DealSchema.ts index c159f94..8e99371 100644 --- a/src/client/models/DealSchema.ts +++ b/src/client/models/DealSchema.ts @@ -12,7 +12,6 @@ import type { DealProductSchema } from './DealProductSchema'; import type { DealServiceSchema } from './DealServiceSchema'; import type { DealStatusHistorySchema } from './DealStatusHistorySchema'; import type { PalletSchema } from './PalletSchema'; -import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema'; import type { ShippingWarehouseSchema } from './ShippingWarehouseSchema'; import type { StatusSchema } from './StatusSchema'; import type { UserSchema } from './UserSchema'; @@ -34,7 +33,6 @@ export type DealSchema = { comment: string; shippingWarehouse?: (ShippingWarehouseSchema | string | null); billRequest?: (DealBillRequestSchema | null); - category?: (ServicePriceCategorySchema | null); group?: (DealGroupSchema | null); manager?: (UserSchema | null); pallets?: Array; diff --git a/src/client/models/DeletePriceCategoryRequest.ts b/src/client/models/DeletePriceCategoryRequest.ts deleted file mode 100644 index fa09b70..0000000 --- a/src/client/models/DeletePriceCategoryRequest.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type DeletePriceCategoryRequest = { - id: number; -}; - diff --git a/src/client/models/DeletePriceCategoryResponse.ts b/src/client/models/DeletePriceCategoryResponse.ts deleted file mode 100644 index c95ffb8..0000000 --- a/src/client/models/DeletePriceCategoryResponse.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type DeletePriceCategoryResponse = { - ok: boolean; - message: string; -}; - diff --git a/src/client/models/GetAllPriceCategoriesResponse.ts b/src/client/models/GetAllPriceCategoriesResponse.ts deleted file mode 100644 index 895b73f..0000000 --- a/src/client/models/GetAllPriceCategoriesResponse.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema'; -export type GetAllPriceCategoriesResponse = { - priceCategories: Array; -}; - diff --git a/src/client/models/ServicePriceCategorySchema.ts b/src/client/models/ProjectSchemaWithCount.ts similarity index 72% rename from src/client/models/ServicePriceCategorySchema.ts rename to src/client/models/ProjectSchemaWithCount.ts index fd0c854..8bcf459 100644 --- a/src/client/models/ServicePriceCategorySchema.ts +++ b/src/client/models/ProjectSchemaWithCount.ts @@ -2,8 +2,9 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export type ServicePriceCategorySchema = { - id: number; +export type ProjectSchemaWithCount = { name: string; + id: number; + boardsCount: number; }; diff --git a/src/client/models/ServiceCategoryPriceSchema.ts b/src/client/models/ServiceCategoryPriceSchema.ts deleted file mode 100644 index e3b5084..0000000 --- a/src/client/models/ServiceCategoryPriceSchema.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema'; -export type ServiceCategoryPriceSchema = { - category: ServicePriceCategorySchema; - price: number; -}; - diff --git a/src/client/models/ServiceSchema.ts b/src/client/models/ServiceSchema.ts index a82419c..0c7b648 100644 --- a/src/client/models/ServiceSchema.ts +++ b/src/client/models/ServiceSchema.ts @@ -2,7 +2,6 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { ServiceCategoryPriceSchema } from './ServiceCategoryPriceSchema'; import type { ServiceCategorySchema } from './ServiceCategorySchema'; import type { ServicePriceRangeSchema } from './ServicePriceRangeSchema'; export type ServiceSchema = { @@ -12,7 +11,6 @@ export type ServiceSchema = { price: number; serviceType: number; priceRanges: Array; - categoryPrices: Array; cost: (number | null); rank: string; isPlaceholder?: (boolean | null); diff --git a/src/client/models/UpdatePriceCategoryRequest.ts b/src/client/models/UpdatePriceCategoryRequest.ts deleted file mode 100644 index 51be544..0000000 --- a/src/client/models/UpdatePriceCategoryRequest.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type UpdatePriceCategoryRequest = { - id: number; - name: string; -}; - diff --git a/src/client/models/UpdatePriceCategoryResponse.ts b/src/client/models/UpdatePriceCategoryResponse.ts deleted file mode 100644 index adaf36d..0000000 --- a/src/client/models/UpdatePriceCategoryResponse.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* generated using openapi-typescript-codegen -- do not edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -export type UpdatePriceCategoryResponse = { - ok: boolean; - message: string; -}; - diff --git a/src/client/services/ServiceService.ts b/src/client/services/ServiceService.ts index 088e3f3..63c8b53 100644 --- a/src/client/services/ServiceService.ts +++ b/src/client/services/ServiceService.ts @@ -3,13 +3,8 @@ /* tslint:disable */ /* eslint-disable */ import type { BaseEnumListSchema } from '../models/BaseEnumListSchema'; -import type { CreatePriceCategoryRequest } from '../models/CreatePriceCategoryRequest'; -import type { CreatePriceCategoryResponse } from '../models/CreatePriceCategoryResponse'; import type { CreateServicesKitRequest } from '../models/CreateServicesKitRequest'; import type { CreateServicesKitResponse } from '../models/CreateServicesKitResponse'; -import type { DeletePriceCategoryRequest } from '../models/DeletePriceCategoryRequest'; -import type { DeletePriceCategoryResponse } from '../models/DeletePriceCategoryResponse'; -import type { GetAllPriceCategoriesResponse } from '../models/GetAllPriceCategoriesResponse'; import type { GetAllServicesKitsResponse } from '../models/GetAllServicesKitsResponse'; import type { ServiceCategoryReorderRequest } from '../models/ServiceCategoryReorderRequest'; import type { ServiceCategoryReorderResponse } from '../models/ServiceCategoryReorderResponse'; @@ -29,8 +24,6 @@ import type { ServiceUpdateCategoryRequest } from '../models/ServiceUpdateCatego import type { ServiceUpdateCategoryResponse } from '../models/ServiceUpdateCategoryResponse'; import type { ServiceUpdateRequest } from '../models/ServiceUpdateRequest'; import type { ServiceUpdateResponse } from '../models/ServiceUpdateResponse'; -import type { UpdatePriceCategoryRequest } from '../models/UpdatePriceCategoryRequest'; -import type { UpdatePriceCategoryResponse } from '../models/UpdatePriceCategoryResponse'; import type { UpdateServicesKitRequest } from '../models/UpdateServicesKitRequest'; import type { UpdateServicesKitResponse } from '../models/UpdateServicesKitResponse'; import type { CancelablePromise } from '../core/CancelablePromise'; @@ -302,77 +295,6 @@ export class ServiceService { }, }); } - /** - * Get All Price Categories - * @returns GetAllPriceCategoriesResponse Successful Response - * @throws ApiError - */ - public static getAllPriceCategories(): CancelablePromise { - return __request(OpenAPI, { - method: 'GET', - url: '/service/price-categories/get-all', - }); - } - /** - * Create Price Category - * @returns CreatePriceCategoryResponse Successful Response - * @throws ApiError - */ - public static createPriceCategory({ - requestBody, - }: { - requestBody: CreatePriceCategoryRequest, - }): CancelablePromise { - return __request(OpenAPI, { - method: 'POST', - url: '/service/price-categories/create', - body: requestBody, - mediaType: 'application/json', - errors: { - 422: `Validation Error`, - }, - }); - } - /** - * Update Price Category - * @returns UpdatePriceCategoryResponse Successful Response - * @throws ApiError - */ - public static updatePriceCategory({ - requestBody, - }: { - requestBody: UpdatePriceCategoryRequest, - }): CancelablePromise { - return __request(OpenAPI, { - method: 'POST', - url: '/service/price-categories/update', - body: requestBody, - mediaType: 'application/json', - errors: { - 422: `Validation Error`, - }, - }); - } - /** - * Delete Price Category - * @returns DeletePriceCategoryResponse Successful Response - * @throws ApiError - */ - public static deletePriceCategory({ - requestBody, - }: { - requestBody: DeletePriceCategoryRequest, - }): CancelablePromise { - return __request(OpenAPI, { - method: 'POST', - url: '/service/price-categories/delete', - body: requestBody, - mediaType: 'application/json', - errors: { - 422: `Validation Error`, - }, - }); - } /** * Export List Pdf * @returns any Successful Response diff --git a/src/components/Dnd/Deals/CreateDealForm/CreateDealFrom.tsx b/src/components/Dnd/Deals/CreateDealForm/CreateDealFrom.tsx index 97f30b4..780d8a8 100644 --- a/src/components/Dnd/Deals/CreateDealForm/CreateDealFrom.tsx +++ b/src/components/Dnd/Deals/CreateDealForm/CreateDealFrom.tsx @@ -8,7 +8,6 @@ import { DateTimePicker } from "@mantine/dates"; import ShippingWarehouseAutocomplete from "../../../Selects/ShippingWarehouseAutocomplete/ShippingWarehouseAutocomplete.tsx"; import BaseMarketplaceSelect from "../../../Selects/BaseMarketplaceSelect/BaseMarketplaceSelect.tsx"; -import ServicePriceCategorySelect from "../../../Selects/ServicePriceCategorySelect/ServicePriceCategorySelect.tsx"; import { usePrefillDealContext } from "../../../../pages/DealsPage/contexts/PrefillDealContext.tsx"; type Props = { @@ -69,14 +68,6 @@ const CreateDealFrom: FC = ({ onSubmit, onCancel }) => { placeholder={"Склад отгрузки"} /> -
- } - placeholder={"Выберите категорию"} - {...form.getInputProps("category")} - /> -
-