From c574a474fb4030e62e55ca02fa3380f6f2cd0b3b Mon Sep 17 00:00:00 2001 From: vol4onok Date: Tue, 10 Sep 2024 16:07:08 +0300 Subject: [PATCH 1/2] ACP-3824: updated composer, Added acl plugin --- composer.lock | 80 ++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index 1fa5c2226..fe41e2a5d 100644 --- a/composer.lock +++ b/composer.lock @@ -31393,16 +31393,16 @@ }, { "name": "spryker/kernel-app", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/kernel-app.git", - "reference": "01fa7697e8e3732c1f772295acb91e7832d9b3ae" + "reference": "c8b667d8658a48a6ac0d9c028214c91b079cafb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/kernel-app/zipball/01fa7697e8e3732c1f772295acb91e7832d9b3ae", - "reference": "01fa7697e8e3732c1f772295acb91e7832d9b3ae", + "url": "https://api.github.com/repos/spryker/kernel-app/zipball/c8b667d8658a48a6ac0d9c028214c91b079cafb2", + "reference": "c8b667d8658a48a6ac0d9c028214c91b079cafb2", "shasum": "" }, "require": { @@ -31442,9 +31442,9 @@ ], "description": "KernelApp module", "support": { - "source": "https://github.com/spryker/kernel-app/tree/1.0.0" + "source": "https://github.com/spryker/kernel-app/tree/1.1.0" }, - "time": "2024-08-06T15:45:00+00:00" + "time": "2024-09-06T13:27:51+00:00" }, { "name": "spryker/kernel-app-extension", @@ -32220,22 +32220,22 @@ }, { "name": "spryker/merchant-app", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/merchant-app.git", - "reference": "8f8adabf02b51aec0a6a97a1ec11c85015992f4d" + "reference": "81f5d1aaa6220d859ea75f45cddb1eaaba7f754f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/merchant-app/zipball/8f8adabf02b51aec0a6a97a1ec11c85015992f4d", - "reference": "8f8adabf02b51aec0a6a97a1ec11c85015992f4d", + "url": "https://api.github.com/repos/spryker/merchant-app/zipball/81f5d1aaa6220d859ea75f45cddb1eaaba7f754f", + "reference": "81f5d1aaa6220d859ea75f45cddb1eaaba7f754f", "shasum": "" }, "require": { "php": ">=8.1", "spryker/kernel": "^3.30.0", - "spryker/kernel-app": "^1.0.0", + "spryker/kernel-app": "^1.1.0", "spryker/kernel-app-extension": "^1.0.0", "spryker/merchant": "^3.0.0", "spryker/merchant-user": "^1.0.0", @@ -32270,29 +32270,29 @@ ], "description": "MerchantApp module", "support": { - "source": "https://github.com/spryker/merchant-app/tree/1.0.0" + "source": "https://github.com/spryker/merchant-app/tree/1.1.0" }, - "time": "2024-08-06T15:45:00+00:00" + "time": "2024-09-06T13:27:51+00:00" }, { "name": "spryker/merchant-app-merchant-portal-gui", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/merchant-app-merchant-portal-gui.git", - "reference": "b72bcacb4883de4c221a6a0c64a0406fe0ba6e5f" + "reference": "e3dc51fd2aee0e68eb441b0d6651e0c466707975" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/merchant-app-merchant-portal-gui/zipball/b72bcacb4883de4c221a6a0c64a0406fe0ba6e5f", - "reference": "b72bcacb4883de4c221a6a0c64a0406fe0ba6e5f", + "url": "https://api.github.com/repos/spryker/merchant-app-merchant-portal-gui/zipball/e3dc51fd2aee0e68eb441b0d6651e0c466707975", + "reference": "e3dc51fd2aee0e68eb441b0d6651e0c466707975", "shasum": "" }, "require": { "php": ">=8.1", "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/kernel": "^3.33.0", - "spryker/merchant-app": "^1.0.0", + "spryker/merchant-app": "^1.1.0", "spryker/merchant-user": "^1.0.0", "spryker/symfony": "^3.0.0", "spryker/transfer": "^3.27.0", @@ -32331,9 +32331,9 @@ ], "description": "MerchantAppMerchantPortalGui module", "support": { - "source": "https://github.com/spryker/merchant-app-merchant-portal-gui/tree/1.0.0" + "source": "https://github.com/spryker/merchant-app-merchant-portal-gui/tree/1.1.0" }, - "time": "2024-08-06T15:45:00+00:00" + "time": "2024-09-06T13:27:51+00:00" }, { "name": "spryker/merchant-categories-rest-api", @@ -38727,16 +38727,16 @@ }, { "name": "spryker/payment", - "version": "5.22.0", + "version": "5.23.0", "source": { "type": "git", "url": "https://github.com/spryker/payment.git", - "reference": "45be2a1b4156613727dcb58b166cb363bc9d9d9c" + "reference": "b8591a9080fda5f25099caf18eebbea8db75c570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/payment/zipball/45be2a1b4156613727dcb58b166cb363bc9d9d9c", - "reference": "45be2a1b4156613727dcb58b166cb363bc9d9d9c", + "url": "https://api.github.com/repos/spryker/payment/zipball/b8591a9080fda5f25099caf18eebbea8db75c570", + "reference": "b8591a9080fda5f25099caf18eebbea8db75c570", "shasum": "" }, "require": { @@ -38793,9 +38793,9 @@ ], "description": "Payment module", "support": { - "source": "https://github.com/spryker/payment/tree/5.22.0" + "source": "https://github.com/spryker/payment/tree/5.23.0" }, - "time": "2024-08-23T15:26:02+00:00" + "time": "2024-09-06T13:27:51+00:00" }, { "name": "spryker/payment-cart-connector", @@ -52655,16 +52655,16 @@ }, { "name": "spryker/sales-payment", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/spryker/sales-payment.git", - "reference": "c4e2275c56eb18cdc865b2e89ea852da48df7f1a" + "reference": "1d12b68ea92a8d7c2e9034dbcc2ad565201c3d19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/sales-payment/zipball/c4e2275c56eb18cdc865b2e89ea852da48df7f1a", - "reference": "c4e2275c56eb18cdc865b2e89ea852da48df7f1a", + "url": "https://api.github.com/repos/spryker/sales-payment/zipball/1d12b68ea92a8d7c2e9034dbcc2ad565201c3d19", + "reference": "1d12b68ea92a8d7c2e9034dbcc2ad565201c3d19", "shasum": "" }, "require": { @@ -52710,9 +52710,9 @@ ], "description": "SalesPayment module", "support": { - "source": "https://github.com/spryker/sales-payment/tree/1.10.0" + "source": "https://github.com/spryker/sales-payment/tree/1.10.1" }, - "time": "2024-08-06T15:45:00+00:00" + "time": "2024-09-10T09:07:51+00:00" }, { "name": "spryker/sales-payment-detail", @@ -52851,20 +52851,21 @@ }, { "name": "spryker/sales-payment-merchant", - "version": "1.1.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/spryker/sales-payment-merchant.git", - "reference": "6107b661e486e98ec6e38437cae29c6859bc32eb" + "reference": "5a56b3307a47764f2167a32918ad7ee023531fa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/sales-payment-merchant/zipball/6107b661e486e98ec6e38437cae29c6859bc32eb", - "reference": "6107b661e486e98ec6e38437cae29c6859bc32eb", + "url": "https://api.github.com/repos/spryker/sales-payment-merchant/zipball/5a56b3307a47764f2167a32918ad7ee023531fa4", + "reference": "5a56b3307a47764f2167a32918ad7ee023531fa4", "shasum": "" }, "require": { "php": ">=8.1", + "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/kernel": "^3.30.0", "spryker/kernel-app": "^1.0.0", "spryker/merchant": "^3.12.0", @@ -52884,6 +52885,7 @@ "spryker/oms": "*", "spryker/propel": "*", "spryker/ramsey-uuid": "*", + "spryker/store": "*", "spryker/testify": "*" }, "suggest": { @@ -52907,9 +52909,9 @@ ], "description": "SalesPaymentMerchant module", "support": { - "source": "https://github.com/spryker/sales-payment-merchant/tree/1.1.0" + "source": "https://github.com/spryker/sales-payment-merchant/tree/1.3.0" }, - "time": "2024-08-13T07:41:07+00:00" + "time": "2024-09-06T13:27:51+00:00" }, { "name": "spryker/sales-payment-merchant-extension", @@ -74812,5 +74814,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 711dd4e47ad6a78f6d96e31b16b82475d6275ef5 Mon Sep 17 00:00:00 2001 From: vol4onok Date: Tue, 10 Sep 2024 16:25:44 +0300 Subject: [PATCH 2/2] ACP-3824: updated composer, Added acl plugin --- .../AclMerchantPortal/AclMerchantPortalDependencyProvider.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Pyz/Zed/AclMerchantPortal/AclMerchantPortalDependencyProvider.php b/src/Pyz/Zed/AclMerchantPortal/AclMerchantPortalDependencyProvider.php index ae0c6b2e5..f47bd3454 100644 --- a/src/Pyz/Zed/AclMerchantPortal/AclMerchantPortalDependencyProvider.php +++ b/src/Pyz/Zed/AclMerchantPortal/AclMerchantPortalDependencyProvider.php @@ -81,6 +81,7 @@ use Spryker\Zed\SalesMerchantCommission\Communication\Plugin\AclMerchantPortal\SalesMerchantCommissionMerchantAclEntityRuleExpanderPlugin; use Spryker\Zed\SalesMerchantPortalGui\Communication\Plugin\AclMerchantPortal\SalesMerchantPortalGuiMerchantAclRuleExpanderPlugin; use Spryker\Zed\SalesOrderThreshold\Communication\Plugin\AclMerchantPortal\SalesOrderThresholdAclEntityConfigurationExpanderPlugin; +use Spryker\Zed\SalesPaymentMerchant\Communication\Plugin\AclMerchantPortal\SalesPaymentMerchantAclEntityConfigurationExpanderPlugin; use Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\AclMerchantPortal\SecurityMerchantPortalGuiMerchantUserAclRuleExpanderPlugin; use Spryker\Zed\ServicePoint\Communication\Plugin\AclMerchantPortal\ServiceAclEntityConfigurationExpanderPlugin; use Spryker\Zed\Shipment\Communication\Plugin\AclMerchantPortal\ShipmentAclEntityConfigurationExpanderPlugin; @@ -212,6 +213,7 @@ protected function getAclEntityConfigurationExpanderPlugins(): array new SalesAclEntityConfigurationExpanderPlugin(), new SalesInvoiceAclEntityConfigurationExpanderPlugin(), new SalesOrderThresholdAclEntityConfigurationExpanderPlugin(), + new SalesPaymentMerchantAclEntityConfigurationExpanderPlugin(), new ShipmentAclEntityConfigurationExpanderPlugin(), new StateMachineAclEntityConfigurationExpanderPlugin(), new StockAclEntityConfigurationExpanderPlugin(),