diff --git a/app/composables/graphql/generated.ts b/app/composables/graphql/generated.ts index 0552da8..eb26275 100644 --- a/app/composables/graphql/generated.ts +++ b/app/composables/graphql/generated.ts @@ -542,6 +542,7 @@ export type QueryManagerNotificationHistoryArgs = { export type QueryManagerOrdersArgs = { + customerId?: InputMaybe; status?: InputMaybe; }; @@ -842,11 +843,17 @@ export type ManagerFinalizeOrderMutation = { __typename?: 'Mutation', managerFin export type ManagerOrdersQueryVariables = Exact<{ status?: InputMaybe; + customerId?: InputMaybe; }>; export type ManagerOrdersQuery = { __typename?: 'Query', managerOrders: Array<{ __typename?: 'Order', id: string, code: string, status: OrderStatus, kind: OrderKind, customerId: string, deliveryAddress?: string | null, deliveryTerms?: string | null, deliveryFee?: number | null, totalPrice?: number | null, createdAt: any, items: Array<{ __typename?: 'OrderItem', id: string, productName: string, quantity: number }> }> }; +export type ManagerUsersDetailQueryVariables = Exact<{ [key: string]: never; }>; + + +export type ManagerUsersDetailQuery = { __typename?: 'Query', managerUsers: Array<{ __typename?: 'ManagerUser', id: string, email: string, fullName: string, companyName?: string | null, inn?: string | null, createdAt: any, orderCount: number, lastOrderAt?: any | null, telegramConnection?: { __typename?: 'MessengerConnection', id: string, type: MessengerType, channelId: string, displayName?: string | null, username?: string | null, avatarAvailable: boolean } | null }> }; + export type ManagerUsersQueryVariables = Exact<{ [key: string]: never; }>; @@ -1690,8 +1697,8 @@ export function useManagerFinalizeOrderMutation(options: VueApolloComposable.Use } export type ManagerFinalizeOrderMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ManagerOrdersDocument = gql` - query ManagerOrders($status: OrderStatus) { - managerOrders(status: $status) { + query ManagerOrders($status: OrderStatus, $customerId: ID) { + managerOrders(status: $status, customerId: $customerId) { id code status @@ -1724,6 +1731,7 @@ export const ManagerOrdersDocument = gql` * @example * const { result, loading, error } = useManagerOrdersQuery({ * status: // value for 'status' + * customerId: // value for 'customerId' * }); */ export function useManagerOrdersQuery(variables: ManagerOrdersQueryVariables | VueCompositionApi.Ref | ReactiveFunction = {}, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { @@ -1733,6 +1741,48 @@ export function useManagerOrdersLazyQuery(variables: ManagerOrdersQueryVariables return VueApolloComposable.useLazyQuery(ManagerOrdersDocument, variables, options); } export type ManagerOrdersQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; +export const ManagerUsersDetailDocument = gql` + query ManagerUsersDetail { + managerUsers { + id + email + fullName + companyName + inn + createdAt + orderCount + lastOrderAt + telegramConnection { + id + type + channelId + displayName + username + avatarAvailable + } + } +} + `; + +/** + * __useManagerUsersDetailQuery__ + * + * To run a query within a Vue component, call `useManagerUsersDetailQuery` and pass it any options that fit your needs. + * When your component renders, `useManagerUsersDetailQuery` returns an object from Apollo Client that contains result, loading and error properties + * you can use to render your UI. + * + * @param options that will be passed into the query, supported options are listed on: https://v4.apollo.vuejs.org/guide-composable/query.html#options; + * + * @example + * const { result, loading, error } = useManagerUsersDetailQuery(); + */ +export function useManagerUsersDetailQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useQuery(ManagerUsersDetailDocument, {}, options); +} +export function useManagerUsersDetailLazyQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useLazyQuery(ManagerUsersDetailDocument, {}, options); +} +export type ManagerUsersDetailQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; export const ManagerUsersDocument = gql` query ManagerUsers { managerUsers { diff --git a/app/pages/clients/[id].vue b/app/pages/clients/[id].vue index 254b4b1..1ee0d84 100644 --- a/app/pages/clients/[id].vue +++ b/app/pages/clients/[id].vue @@ -1,58 +1,94 @@ @@ -60,71 +96,106 @@ async function rejectRequest() {
← Назад к пользователям -
- Загружаем карточку клиента... -
+
diff --git a/app/pages/clients/index.vue b/app/pages/clients/index.vue index 794df08..e14299d 100644 --- a/app/pages/clients/index.vue +++ b/app/pages/clients/index.vue @@ -147,9 +147,10 @@ function userInitials(fullName: string) { Пользователи по текущему запросу не найдены.
-
@@ -172,7 +173,7 @@ function userInitials(fullName: string) {

{{ user.fullName }}

-
+
diff --git a/app/pages/orders.vue b/app/pages/orders.vue index 14dc929..2a9c385 100644 --- a/app/pages/orders.vue +++ b/app/pages/orders.vue @@ -69,10 +69,11 @@ const filteredOrders = computed(() => {
-
@@ -95,7 +96,7 @@ const filteredOrders = computed(() => { {{ item.productName }} × {{ item.quantity }} -
+
diff --git a/app/pages/orders/[id].vue b/app/pages/orders/[id].vue new file mode 100644 index 0000000..0c9ad37 --- /dev/null +++ b/app/pages/orders/[id].vue @@ -0,0 +1,76 @@ + + + diff --git a/graphql/operations/manager/manager-orders.graphql b/graphql/operations/manager/manager-orders.graphql index d71b978..407f3c2 100644 --- a/graphql/operations/manager/manager-orders.graphql +++ b/graphql/operations/manager/manager-orders.graphql @@ -1,5 +1,5 @@ -query ManagerOrders($status: OrderStatus) { - managerOrders(status: $status) { +query ManagerOrders($status: OrderStatus, $customerId: ID) { + managerOrders(status: $status, customerId: $customerId) { id code status diff --git a/graphql/operations/manager/manager-users-detail.graphql b/graphql/operations/manager/manager-users-detail.graphql new file mode 100644 index 0000000..84aea5c --- /dev/null +++ b/graphql/operations/manager/manager-users-detail.graphql @@ -0,0 +1,20 @@ +query ManagerUsersDetail { + managerUsers { + id + email + fullName + companyName + inn + createdAt + orderCount + lastOrderAt + telegramConnection { + id + type + channelId + displayName + username + avatarAvailable + } + } +} diff --git a/graphql/schema.graphql b/graphql/schema.graphql index 4bc7bab..3796511 100644 --- a/graphql/schema.graphql +++ b/graphql/schema.graphql @@ -335,7 +335,7 @@ type Query { myOrders: [Order!]! myCurrentOrders: [Order!]! managerUsers: [ManagerUser!]! - managerOrders(status: OrderStatus): [Order!]! + managerOrders(status: OrderStatus, customerId: ID): [Order!]! managerBonusBalances: [ManagerBonusBalance!]! managerWithdrawalRequests(status: WithdrawalStatus): [ManagerWithdrawalRequest!]! registrationRequests(status: RegistrationStatus): [RegistrationRequest!]!