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

fix: V4 | revert order histories and bundles naming #384

Merged
merged 7 commits into from
Oct 22, 2024
Merged

fix: V4 | revert order histories and bundles naming #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
795b747
fix: rename order-histories to order-status-history
fox-john Oct 21, 2024
c1849e7
fix: rename product-bundles to bundles
fox-john Oct 21, 2024
39e5a24
fix: e2e
fox-john Oct 21, 2024
b7daca6
fix: e2e
fox-john Oct 21, 2024
724cb67
fix: php-stan and php-cs-fixer
fox-john Oct 21, 2024
1c1d5c0
fix: php-stan and php-cs-fixer
fox-john Oct 22, 2024
42896cb
fix: E2e test in 1.6
fox-john Oct 22, 2024
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
12 changes: 6 additions & 6 deletions config/common/repository.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ services:
###################################### SHOP CONTENT REPOSITORIES ###########################################
############################################################################################################

PrestaShop\Module\PsEventbus\Repository\BundleRepository:
class: PrestaShop\Module\PsEventbus\Repository\BundleRepository
public: true

PrestaShop\Module\PsEventbus\Repository\CarrierRepository:
class: PrestaShop\Module\PsEventbus\Repository\CarrierRepository
public: true
Expand Down Expand Up @@ -103,8 +107,8 @@ services:
class: PrestaShop\Module\PsEventbus\Repository\OrderCartRuleRepository
public: true

PrestaShop\Module\PsEventbus\Repository\OrderHistoryRepository:
class: PrestaShop\Module\PsEventbus\Repository\OrderHistoryRepository
PrestaShop\Module\PsEventbus\Repository\OrderstatusHistoryRepository:
class: PrestaShop\Module\PsEventbus\Repository\OrderStatusHistoryRepository
public: true

PrestaShop\Module\PsEventbus\Repository\OrderDetailRepository:
Expand All @@ -115,10 +119,6 @@ services:
class: PrestaShop\Module\PsEventbus\Repository\ProductRepository
public: true

PrestaShop\Module\PsEventbus\Repository\ProductBundleRepository:
class: PrestaShop\Module\PsEventbus\Repository\ProductBundleRepository
public: true

PrestaShop\Module\PsEventbus\Repository\ProductSupplierRepository:
class: PrestaShop\Module\PsEventbus\Repository\ProductSupplierRepository
public: true
Expand Down
21 changes: 10 additions & 11 deletions config/front/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ services:
############################################################################################################
###################################### SHOP CONTENT SERVICES ###############################################
############################################################################################################

PrestaShop\Module\PsEventbus\Service\ShopContent\BundlesService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\BundlesService
public: true
arguments:
- '@PrestaShop\Module\PsEventbus\Repository\BundleRepository'

PrestaShop\Module\PsEventbus\Service\ShopContent\CarriersService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\CarriersService
public: true
Expand Down Expand Up @@ -158,7 +163,7 @@ services:
public: true
arguments:
- '@PrestaShop\Module\PsEventbus\Repository\OrderRepository'
- '@PrestaShop\Module\PsEventbus\Repository\OrderHistoryRepository'
- '@PrestaShop\Module\PsEventbus\Repository\OrderstatusHistoryRepository'
- '@PrestaShop\Module\PsEventbus\Formatter\ArrayFormatter'

PrestaShop\Module\PsEventbus\Service\ShopContent\OrderCartRulesService:
Expand All @@ -173,11 +178,11 @@ services:
arguments:
- '@PrestaShop\Module\PsEventbus\Repository\OrderDetailRepository'

PrestaShop\Module\PsEventbus\Service\ShopContent\OrderHistoriesService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\OrderHistoriesService
PrestaShop\Module\PsEventbus\Service\ShopContent\OrderStatusHistoryService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\OrderStatusHistoryService
public: true
arguments:
- '@PrestaShop\Module\PsEventbus\Repository\OrderHistoryRepository'
- '@PrestaShop\Module\PsEventbus\Repository\OrderstatusHistoryRepository'

PrestaShop\Module\PsEventbus\Service\ShopContent\ProductsService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\ProductsService
Expand All @@ -188,12 +193,6 @@ services:
- '@PrestaShop\Module\PsEventbus\Service\ShopContent\CategoriesService'
- '@PrestaShop\Module\PsEventbus\Formatter\ArrayFormatter'

PrestaShop\Module\PsEventbus\Service\ShopContent\ProductBundlesService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\ProductBundlesService
public: true
arguments:
- '@PrestaShop\Module\PsEventbus\Repository\ProductBundleRepository'

PrestaShop\Module\PsEventbus\Service\ShopContent\ProductSuppliersService:
class: PrestaShop\Module\PsEventbus\Service\ShopContent\ProductSuppliersService
public: true
Expand Down
0 e2e/src/fixtures/1.6/product_bundles.json → e2e/src/fixtures/1.6/bundles.json
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions e2e/src/fixtures/1.6/order_history.json → ...rc/fixtures/1.6/order_status_history.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": 1,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 1,
Expand All @@ -20,7 +20,7 @@
},
{
"id": 2,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 2,
Expand All @@ -39,7 +39,7 @@
},
{
"id": 3,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 3,
Expand All @@ -58,7 +58,7 @@
},
{
"id": 4,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 4,
Expand All @@ -77,7 +77,7 @@
},
{
"id": 5,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 10,
"id_order": 5,
Expand All @@ -96,7 +96,7 @@
},
{
"id": 6,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 6,
"id_order": 1,
Expand All @@ -115,7 +115,7 @@
},
{
"id": 7,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 8,
"id_order": 3,
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/fixtures/1.7/product_bundles.json → e2e/src/fixtures/1.7/bundles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": "15",
"collection": "product_bundles",
"collection": "bundles",
"properties": {
"id_bundle": "15",
"id_product": "5",
Expand All @@ -12,7 +12,7 @@
},
{
"id": "15",
"collection": "product_bundles",
"collection": "bundles",
"properties": {
"id_bundle": "15",
"id_product": "7",
Expand Down
135 changes: 0 additions & 135 deletions e2e/src/fixtures/1.7/order_histories.json
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions e2e/src/fixtures/1.6/order_histories.json → ...rc/fixtures/1.7/order_status_history.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": 1,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 1,
Expand All @@ -20,7 +20,7 @@
},
{
"id": 2,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 2,
Expand All @@ -39,7 +39,7 @@
},
{
"id": 3,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 3,
Expand All @@ -58,7 +58,7 @@
},
{
"id": 4,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 1,
"id_order": 4,
Expand All @@ -77,7 +77,7 @@
},
{
"id": 5,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 10,
"id_order": 5,
Expand All @@ -96,7 +96,7 @@
},
{
"id": 6,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 6,
"id_order": 1,
Expand All @@ -115,7 +115,7 @@
},
{
"id": 7,
"collection": "order_histories",
"collection": "order_status_history",
"properties": {
"id_order_state": 8,
"id_order": 3,
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/fixtures/8/product_bundles.json → e2e/src/fixtures/8/bundles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": 15,
"collection": "product_bundles",
"collection": "bundles",
"properties": {
"id_bundle": 15,
"id_product": 5,
Expand All @@ -12,7 +12,7 @@
},
{
"id": 15,
"collection": "product_bundles",
"collection": "bundles",
"properties": {
"id_bundle": 15,
"id_product": 7,
Expand Down
Loading
Loading