Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC-29651 Click&Collect integration. #195

Merged
merged 38 commits into from
Nov 3, 2023
Merged

CC-29651 Click&Collect integration. #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
483e639
CC-29651: prepared c&c backend.
romanhavrylko Oct 17, 2023
90f6781
CC-29651: updated dependencies.
romanhavrylko Oct 18, 2023
848c686
CC-31573 FE Integration
Oct 20, 2023
d71425a
CC-31573 FE Integration
Oct 23, 2023
3adcf2a
CC-29651: merged internal branch.
romanhavrylko Oct 24, 2023
2c022bd
CC-31565 Integration.
kkicheglovspryker Oct 26, 2023
81444f6
CC-31565 Integration.
kkicheglovspryker Oct 26, 2023
d762ede
Merge pull request #204 from spryker-shop/bugfix/cc-31565-product-bun…
romanhavrylko Oct 26, 2023
70f4b36
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of …
Oct 26, 2023
5608c34
CC-31573 FE Integration
Oct 27, 2023
bf2d61a
CC-31573 FE Integration
Oct 27, 2023
5c27aec
CC-31573 FE fix format
Oct 27, 2023
c8f8202
CC-29651: added missing data.
romanhavrylko Oct 27, 2023
0148c8d
CC-29651: merged internal branch.
romanhavrylko Oct 27, 2023
223ff1b
Merge branches 'feature/cc-29651/dev-click-and-collect-integration' a…
Oct 30, 2023
45fe38e
CC-31486: Integration.
dmiseev Oct 30, 2023
b1c33da
Merge pull request #215 from spryker-shop/feature/cc-31486/dev-archit…
dmiseev Oct 31, 2023
83a2224
Merge branch 'internal' into feature/cc-29651/dev-click-and-collect-i…
dmiseev Oct 31, 2023
442ea8d
Updated lock file after merging.
dmiseev Oct 31, 2023
8894665
CC-31573 FE stabilization integration.
Oct 31, 2023
affc491
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of …
Oct 31, 2023
267c162
CC-31486: Fixed failed tests.
dmiseev Nov 1, 2023
b6fb3c3
CC-31486: Fixed CI.
dmiseev Nov 1, 2023
4a426a6
CC-31486: Added SP name to ODP [skip ci]
dmiseev Nov 1, 2023
1f62558
CC-31729: GLUE integration.
dmiseev Nov 1, 2023
e7aa3e7
CC-31573 FE fixes after code review
Nov 1, 2023
36c8bf8
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of …
Nov 1, 2023
5438d6f
CC-31729: Fixed CI [skip ci]
dmiseev Nov 1, 2023
5cbf451
Merge pull request #218 from spryker-shop/feature/cc-30930/dev-replac…
dmiseev Nov 1, 2023
a010f12
CC-31573 FE fixes after code review
Nov 1, 2023
c2ba064
Merge branch 'feature/cc-29651/dev-click-and-collect-integration' of …
Nov 1, 2023
91606d8
CC-31573 FE fixes after code review
Nov 1, 2023
36cdd43
CC-31734: integrated c&c stabilization.
romanhavrylko Nov 2, 2023
f7368bf
CC-29651: merged internal branch.
romanhavrylko Nov 2, 2023
50622d0
CC-29651: added tests.
romanhavrylko Nov 2, 2023
6a42ce7
CC-29651: updated demo data.
romanhavrylko Nov 2, 2023
8164c07
CC-29651: fixed cs.
romanhavrylko Nov 2, 2023
91009da
CC-29651: updated translation.
romanhavrylko Nov 3, 2023
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
45 changes: 36 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"spryker-feature/cart": "dev-master as 202311.0",
"spryker-feature/catalog": "^202307.0",
"spryker-feature/category-management": "^202307.0",
"spryker-feature/checkout": "^202307.0",
"spryker-feature/checkout": "dev-master as 202311.0",
"spryker-feature/cms": "^202307.0",
"spryker-feature/configurable-bundle": "^202307.0",
"spryker-feature/configurable-product": "^202307.0",
"spryker-feature/configurable-product-wishlist": "^202307.0",
"spryker-feature/customer-access": "^202307.0",
"spryker-feature/customer-account-management": "^202307.0",
"spryker-feature/customer-account-management": "dev-master as 202311.0",
"spryker-feature/data-exchange-api": "dev-master as 202311.0",
"spryker-feature/deployment-tools": "^202307.0",
"spryker-feature/file-manager": "dev-master as 202311.0",
Expand All @@ -42,17 +42,20 @@
"spryker-feature/marketplace-inventory-management": "dev-master as 202311.0",
"spryker-feature/marketplace-merchant": "^202307.0",
"spryker-feature/marketplace-merchant-portal-product-management": "^202307.0",
"spryker-feature/marketplace-merchant-portal-product-offer-management": "^202307.0",
"spryker-feature/marketplace-merchant-portal-product-offer-management": "dev-master as 202311.0",
"spryker-feature/marketplace-merchant-portal-product-offer-service-points": "dev-master as 202311.0",
"spryker-feature/marketplace-merchant-portal-product-offer-shipment": "dev-master as 202311.0",
"spryker-feature/marketplace-merchant-product-offer-service-points-availability": "dev-master as 202311.0",
"spryker-feature/marketplace-merchantportal-core": "^202307.0",
"spryker-feature/marketplace-order-management": "^202307.0",
"spryker-feature/marketplace-product": "dev-master as 202311.0",
"spryker-feature/marketplace-product-approval-process": "^202307.0",
"spryker-feature/marketplace-product-offer": "^202307.0",
"spryker-feature/marketplace-product-offer": "dev-master as 202311.0",
"spryker-feature/marketplace-product-offer-prices": "^202307.0",
"spryker-feature/marketplace-product-options": "^202307.0",
"spryker-feature/marketplace-promotions-discounts": "^202307.0",
"spryker-feature/marketplace-return-management": "^202307.0",
"spryker-feature/marketplace-shipment": "^202307.0",
"spryker-feature/marketplace-shipment": "dev-master as 202311.0",
"spryker-feature/marketplace-wishlist": "^202307.0",
"spryker-feature/merchant": "dev-master as 202311.0",
"spryker-feature/merchant-category": "^202307.0",
Expand All @@ -65,10 +68,14 @@
"spryker-feature/product": "dev-master as 202311.0",
"spryker-feature/product-approval-process": "^202307.0",
"spryker-feature/product-barcode": "^202307.0",
"spryker-feature/product-bundles": "^202307.0",
"spryker-feature/product-bundles": "dev-master as 202311.0",
"spryker-feature/product-groups": "^202307.0",
"spryker-feature/product-labels": "^202307.0",
"spryker-feature/product-lists": "dev-master as 202311.0",
"spryker-feature/product-offer-service-points": "dev-master as 202311.0",
"spryker-feature/product-offer-service-points-availability": "dev-master as 202311.0",
"spryker-feature/product-offer-shipment": "dev-master as 202311.0",
"spryker-feature/product-offer-shipment-availability": "dev-master as 202311.0",
"spryker-feature/product-options": "^202307.0",
"spryker-feature/product-rating-reviews": "^202307.0",
"spryker-feature/product-relations": "^202307.0",
Expand All @@ -81,7 +88,12 @@
"spryker-feature/return-management": "^202307.0",
"spryker-feature/scheduled-prices": "dev-master as 202311.0",
"spryker-feature/search": "dev-master as 202311.0",
"spryker-feature/shipment": "^202307.0",
"spryker-feature/service-points": "dev-master as 202311.0",
"spryker-feature/service-points-cart": "dev-master as 202311.0",
"spryker-feature/shipment": "dev-master as 202311.0",
"spryker-feature/shipment-cart": "dev-master as 202311.0",
"spryker-feature/shipment-product-offer-service-points-availability": "dev-master as 202311.0",
"spryker-feature/shipment-service-points": "dev-master as 202311.0",
"spryker-feature/spryker-core": "dev-master as 202311.0",
"spryker-feature/spryker-core-back-office": "^202307.0",
"spryker-feature/state-machine": "^202307.0",
Expand All @@ -92,6 +104,7 @@
"spryker-shop/asset-widget": "^1.0.0",
"spryker-shop/calculation-page": "^1.3.2",
"spryker-shop/chart-widget": "^0.2.3",
"spryker-shop/click-and-collect-page-example": "^0.3.0",
"spryker-shop/cms-content-widget-chart-connector": "^1.0.3",
"spryker-shop/cms-content-widget-product-connector": "^1.3.0",
"spryker-shop/cms-content-widget-product-set-connector": "^1.3.2",
Expand Down Expand Up @@ -121,6 +134,7 @@
"spryker/category-navigation-connector": "^1.0.3",
"spryker/chart-gui": "^1.1.1",
"spryker/checkout-rest-api": "^3.7.2",
"spryker/click-and-collect-example": "^0.8.0",
"spryker/cms-content-widget-cms-block-connector": "^1.4.0",
"spryker/cms-content-widget-content-connector": "^1.0.0",
"spryker/cms-content-widget-product-connector": "^1.2.0",
Expand Down Expand Up @@ -166,10 +180,12 @@
"spryker/merchant": "^3.9.0",
"spryker/merchant-categories-rest-api": "^1.0.0",
"spryker/merchant-opening-hours-rest-api": "^1.0.0",
"spryker/merchant-product-offer-service-point-availabilities-rest-api": "^0.3.0",
"spryker/merchant-product-offer-wishlist-rest-api": "^1.1.1",
"spryker/merchant-product-offers-rest-api": "^2.0.0",
"spryker/merchant-products-rest-api": "^1.0.0",
"spryker/merchant-profile-merchant-portal-gui": "^2.3.1",
"spryker/merchant-shipments-rest-api": "^0.1.0",
"spryker/merchants-rest-api": "^1.0.0",
"spryker/message-broker": "^1.9.0",
"spryker/message-broker-aws": "^1.5.1",
Expand Down Expand Up @@ -200,7 +216,7 @@
"spryker/product-alternative-product-label-connector": "^1.2.0",
"spryker/product-attributes-rest-api": "^1.0.0",
"spryker/product-availabilities-rest-api": "^4.2.0",
"spryker/product-bundle-carts-rest-api": "^1.0.0",
"spryker/product-bundle-carts-rest-api": "^1.1.0",
"spryker/product-bundle-discount-connector": "^1.1.0",
"spryker/product-bundles-rest-api": "^1.0.1",
"spryker/product-cart-connector": "^4.10.1",
Expand All @@ -219,6 +235,9 @@
"spryker/product-offer-availabilities-rest-api": "^1.1.0",
"spryker/product-offer-prices-rest-api": "^2.0.1",
"spryker/product-offer-sales-rest-api": "^1.0.1",
"spryker/product-offer-service-point-availabilities-rest-api": "^1.0.0",
"spryker/product-offer-service-point-merchant-portal-gui": "^1.0.0",
"spryker/product-offer-shipment-type-merchant-portal-gui": "^1.0.0",
"spryker/product-offer-warehouse-allocation-example": "^0.2.0",
"spryker/product-option-cart-connector": "^7.1.3",
"spryker/product-option-merchant-portal-gui": "^1.0.1",
Expand All @@ -245,11 +264,18 @@
"spryker/security-blocker-merchant-portal-gui": "^1.0.0",
"spryker/security-blocker-rest-api": "^1.0.0",
"spryker/security-system-user": "^1.0.0",
"spryker/service-point-carts-rest-api": "^1.0.0",
"spryker/service-points-backend-api": "^1.0.0",
"spryker/service-points-rest-api": "^1.0.0",
"spryker/shipment-cart-connector": "^2.1.2",
"spryker/shipment-checkout-connector": "^2.0.5",
"spryker/shipment-discount-connector": "^4.0.5",
"spryker/shipment-type-product-offer-service-point-availabilities-rest-api": "^1.0.0",
"spryker/shipment-type-service-points-rest-api": "^1.0.0",
"spryker/shipment-types-backend-api": "^1.0.0",
"spryker/shipment-types-rest-api": "^1.0.0",
"spryker/shipments-backend-api": "^1.0.0",
"spryker/shipments-rest-api": "^1.7.1",
"spryker/shipments-rest-api": "^1.12.0",
"spryker/storage-gui": "^1.0.0",
"spryker/stores-api": "^1.0.0",
"spryker/stores-backend-api": "^1.0.0",
Expand All @@ -265,6 +291,7 @@
"spryker/warehouse-oauth-backend-api": "^1.0.0",
"spryker/warehouse-users-backend-api": "^1.0.0",
"spryker/warehouses-backend-api": "^1.0.0",
"spryker/willdurand-negotiation": "^1.0.0",
"spryker/wishlists-rest-api": "^1.6.2",
"symfony/http-kernel": "^6.0.20"
},
Expand Down
Loading
Loading