Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
042d9c1
feat: pickup locations in products query
yuskithedeveloper Sep 9, 2025
19a981b
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 11, 2025
8080e3e
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 15, 2025
f734449
feat: getProductPickupLocations query, productPickupLocations component
yuskithedeveloper Sep 15, 2025
afa28bf
feat: styles, locales
yuskithedeveloper Sep 15, 2025
0a8779e
feat: max pickup locations for product
yuskithedeveloper Sep 15, 2025
64debb2
fix: translator
yuskithedeveloper Sep 15, 2025
0d4174b
fix: translator
yuskithedeveloper Sep 15, 2025
2572a39
fix: translator
yuskithedeveloper Sep 15, 2025
9d60a01
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 16, 2025
fe6bd05
feat: check if any pickup locations exist
yuskithedeveloper Sep 16, 2025
a1c250f
fix: locales
yuskithedeveloper Sep 17, 2025
41d73a7
feat: additional pickup location fields
yuskithedeveloper Sep 17, 2025
ffcb9b6
refactor: useProductPickupLocations moved
yuskithedeveloper Sep 17, 2025
6a04813
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 17, 2025
49595e4
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 17, 2025
e1ea510
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 17, 2025
ee470ba
Merge branch 'dev' into feat/VCST-3592-product-pickup-data
yuskithedeveloper Sep 18, 2025
0649747
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
yuskithedeveloper Sep 24, 2025
548c545
feat: updated graphql types for getProductPickupLocationsQuery and ge…
yuskithedeveloper Sep 24, 2025
2ee7b2d
feat: useBopis using useCartPickupLocations instead of getPickupLocat…
yuskithedeveloper Sep 24, 2025
9e6b33c
feat: cart pickup locations UI (map, list)
yuskithedeveloper Sep 24, 2025
648f0f6
feat: locales
yuskithedeveloper Sep 24, 2025
753ebe1
fix: active pickup location select
yuskithedeveloper Sep 24, 2025
44e4e4e
test: removed commented code
yuskithedeveloper Sep 24, 2025
c89757f
feat: removed outerId field
yuskithedeveloper Sep 25, 2025
ba9334a
feat: obsolete
yuskithedeveloper Sep 25, 2025
1e5bfad
feat: truck icons
yuskithedeveloper Sep 25, 2025
0920c76
feat: x-pickup enabled check
yuskithedeveloper Sep 26, 2025
052dc97
fix: pickup addresses list fix
yuskithedeveloper Sep 26, 2025
950b95c
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
yuskithedeveloper Sep 26, 2025
bedac82
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
Lenajava1 Oct 2, 2025
438044b
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
Lenajava1 Oct 3, 2025
7af1b76
feat: add missed locales keys
ivan-kalachikov Oct 3, 2025
ea2e020
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
yuskithedeveloper Oct 7, 2025
f7a39ac
refactor: typos fix
yuskithedeveloper Oct 7, 2025
ccc4a33
refactor: not used fields removed
yuskithedeveloper Oct 7, 2025
75a889d
refactor: extracted const
yuskithedeveloper Oct 7, 2025
5fab934
refactor: property rename
yuskithedeveloper Oct 7, 2025
0c57595
refactor: markup
yuskithedeveloper Oct 7, 2025
8498a97
feat: cart pickup locations not found messages
yuskithedeveloper Oct 7, 2025
63efadd
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
Lenajava1 Oct 8, 2025
c22506f
feat: improved locales
yuskithedeveloper Oct 8, 2025
d09e287
test: bopis test fix
yuskithedeveloper Oct 8, 2025
905310d
Merge branch 'feat/VCST-3983-product-and-cart-pickup-locations' of ht…
yuskithedeveloper Oct 8, 2025
a7f0a89
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
yuskithedeveloper Oct 9, 2025
3365c83
Merge branch 'dev' into feat/VCST-3983-product-and-cart-pickup-locations
yuskithedeveloper Oct 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions client-app/assets/images/in-store-pickup.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions client-app/core/api/graphql/cart/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from "./queries/getCartPickupLocations";
export * from "./queries/getFullCart";
export * from "./queries/getShortCart";
export * from "./queries/validateCoupon";
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
query GetCartPickupLocations(
$storeId: String!
$cultureName: String!
$cartId: String!
$keyword: String
$first: Int
$after: String
$sort: String
) {
cartPickupLocations(
storeId: $storeId
cultureName: $cultureName
cartId: $cartId
keyword: $keyword
first: $first
after: $after
sort: $sort
) {
totalCount
items {
id
name
description
contactEmail
contactPhone
workingHours
geoLocation
availabilityType
availableQuantity
availabilityNote
address {
id
line1
line2
city
countryName
countryCode
regionId
postalCode
phone
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { globals } from "@/core/globals";
import { graphqlClient } from "../../../client";
import getCartPickupLocationsQueryDocument from "./getCartPickupLocationsQuery.graphql";
import type { Query, QueryCartPickupLocationsArgs, ProductPickupLocationConnection } from "@/core/api/graphql/types";

export async function getCartPickupLocations(
payload: Omit<QueryCartPickupLocationsArgs, "storeId" | "cultureName">,
): Promise<ProductPickupLocationConnection> {
const { storeId, cultureName } = globals;

const { data } = await graphqlClient.query<
Required<Pick<Query, "cartPickupLocations">>,
QueryCartPickupLocationsArgs
>({
query: getCartPickupLocationsQueryDocument,
variables: {
storeId,
cultureName,
...payload,
},
});

return data.cartPickupLocations;
}
1 change: 1 addition & 0 deletions client-app/core/api/graphql/catalog/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export * from "./queries/getCategory";
export * from "./queries/getConfigurationItems";
export * from "./queries/getProduct";
export * from "./queries/getProductConfigurations";
export * from "./queries/getProductPickupLocations";
export * from "./queries/getSearchResults";
export * from "./queries/recentlyBrowsed";
export * from "./queries/searchProducts";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
query GetProductPickupLocations(
$storeId: String!
$cultureName: String!
$productId: String!
$keyword: String
$first: Int
$after: String
$sort: String
) {
productPickupLocations(
storeId: $storeId
cultureName: $cultureName
productId: $productId
keyword: $keyword
first: $first
after: $after
sort: $sort
) {
totalCount
items {
id
name
availabilityType
availableQuantity
availabilityNote
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { globals } from "@/core/globals";
import { graphqlClient } from "../../../client";
import getProductPickupLocationsQueryDocument from "./getProductPickupLocationsQuery.graphql";
import type { Query, QueryProductPickupLocationsArgs, ProductPickupLocationConnection } from "@/core/api/graphql/types";

export async function getProductPickupLocations(
payload: Omit<QueryProductPickupLocationsArgs, "storeId" | "cultureName">,
): Promise<ProductPickupLocationConnection> {
const { storeId, cultureName } = globals;

const { data } = await graphqlClient.query<
Required<Pick<Query, "productPickupLocations">>,
QueryProductPickupLocationsArgs
>({
query: getProductPickupLocationsQueryDocument,
variables: {
storeId,
cultureName,
...payload,
},
});

return data.productPickupLocations;
}
1 change: 0 additions & 1 deletion client-app/core/api/graphql/shipment/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

Loading